diff --git a/src/sp-fecomposite.cpp b/src/sp-fecomposite.cpp
index 68312aa1b9ffd95a046ad120d1e34683f23a263e..cb1726be79b3be2744a7f28da5546fad2716ce8e 100644 (file)
--- a/src/sp-fecomposite.cpp
+++ b/src/sp-fecomposite.cpp
#include "attributes.h"
#include "svg/svg.h"
#include "sp-fecomposite.h"
+#include "helper-fns.h"
#include "xml/repr.h"
#include "display/nr-filter-composite.h"
((SPObjectClass *) feComposite_parent_class)->release(object);
}
-static double
-sp_feComposite_read_number(gchar const *value) {
- char *end;
- double ret = g_ascii_strtod(value, &end);
- if (*end) {
- g_warning("Unable to convert \"%s\" to number", value);
- // We could leave this out, too. If strtod can't convert
- // anything, it will return zero.
- ret = 0;
- }
- return ret;
-}
-
static FeCompositeOperator
sp_feComposite_read_operator(gchar const *value) {
if (!value) return COMPOSITE_DEFAULT;
break;
case SP_ATTR_K1:
- k_n = sp_feComposite_read_number(value);
+ k_n = helperfns_read_number(value);
if (k_n != feComposite->k1) {
feComposite->k1 = k_n;
if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)
break;
case SP_ATTR_K2:
- k_n = sp_feComposite_read_number(value);
+ k_n = helperfns_read_number(value);
if (k_n != feComposite->k2) {
feComposite->k2 = k_n;
if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)
break;
case SP_ATTR_K3:
- k_n = sp_feComposite_read_number(value);
+ k_n = helperfns_read_number(value);
if (k_n != feComposite->k3) {
feComposite->k3 = k_n;
if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)
break;
case SP_ATTR_K4:
- k_n = sp_feComposite_read_number(value);
+ k_n = helperfns_read_number(value);
if (k_n != feComposite->k4) {
feComposite->k4 = k_n;
if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)