sync with current 2geom, split_at_discontinuities method and SVGEllipticalArc

[inkscape.git] / src / sp-feconvolvematrix.h

diff --git a/src/sp-feconvolvematrix.h b/src/sp-feconvolvematrix.h
index 53ed8b741e822c65e1439866ab8640f9bc16f7bb..2cdeee2e8af373581853a47462c21365f1c10edd 100644 (file)
--- a/src/sp-feconvolvematrix.h
+++ b/src/sp-feconvolvematrix.h
@@ -17,9 +17,8 @@
 #include "sp-filter.h"
 #include "sp-feconvolvematrix-fns.h"
 #include "number-opt-number.h"
+#include "display/nr-filter-convolve-matrix.h"
 #include <vector>
-//#include <glib.h>
-
 
 /* FeConvolveMatrix base class */
 class SPFeConvolveMatrixClass;
@@ -30,9 +29,14 @@ struct SPFeConvolveMatrix : public SPFilterPrimitive {
     std::vector<gdouble> kernelMatrix;
     double divisor, bias;
     int targetX, targetY;
-    unsigned short edgeMode;
+    NR::FilterConvolveMatrixEdgeMode edgeMode;
     NumberOptNumber kernelUnitLength;
     bool preserveAlpha;
+    //some helper variables:
+    bool targetXIsSet;
+    bool targetYIsSet;
+    bool divisorIsSet;
+    bool kernelMatrixIsSet;
 };
 
 struct SPFeConvolveMatrixClass {