X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-feconvolvematrix.cpp;h=b50d849751ca8a8ede7013904ed7451c2b2fcc20;hb=b752616506705efd28f22c4d852d198ff40c7026;hp=adabc1bac06d1362551897906d7087f4c3ebab49;hpb=12f8d6edf83762026a782661a1e458bf4d026248;p=inkscape.git

diff --git a/src/sp-feconvolvematrix.cpp b/src/sp-feconvolvematrix.cpp
index adabc1bac..b50d84975 100644
--- a/src/sp-feconvolvematrix.cpp
+++ b/src/sp-feconvolvematrix.cpp
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include <vector>
 #include "attributes.h"
 #include "svg/svg.h"
@@ -25,6 +27,7 @@
 #include "helper-fns.h"
 #include "xml/repr.h"
 #include "display/nr-filter-convolve-matrix.h"
+#include <math.h>
 
 /* FeConvolveMatrix base class */
 
@@ -80,7 +83,19 @@ sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass)
 
 static void
 sp_feConvolveMatrix_init(SPFeConvolveMatrix *feConvolveMatrix)
-{}
+{
+    //Setting default values:
+    feConvolveMatrix->order.set("3 3");
+    feConvolveMatrix->targetX = 1;
+    feConvolveMatrix->targetY = 1;
+    feConvolveMatrix->edgeMode = NR::CONVOLVEMATRIX_EDGEMODE_DUPLICATE;
+    feConvolveMatrix->preserveAlpha = false;
+
+    //some helper variables:
+    feConvolveMatrix->targetXIsSet = false;
+    feConvolveMatrix->targetYIsSet = false;
+    feConvolveMatrix->kernelMatrixIsSet = false;
+}
 
 /**
  * Reads the Inkscape::XML::Node, and initializes SPFeConvolveMatrix variables.  For this to get called,
@@ -104,7 +119,6 @@ sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML:
     sp_object_read_attr(object, "edgeMode");
     sp_object_read_attr(object, "kernelUnitLength");
     sp_object_read_attr(object, "preserveAlpha");
-
 }
 
 /**
@@ -117,29 +131,20 @@ sp_feConvolveMatrix_release(SPObject *object)
         ((SPObjectClass *) feConvolveMatrix_parent_class)->release(object);
 }
 
-static std::vector<gdouble> read_kernel_matrix(const gchar* value, int size){
-        std::vector<gdouble> v(size, (gdouble) 0);
-        int i;
-        gchar** values = g_strsplit(value , " ", size);
-        for (i=0;i<size;i++)
-                v[i] = g_ascii_strtod(values[i], NULL);
-        return v;
-}
-
-static int sp_feConvolveMatrix_read_edgeMode(gchar const *value){
-    if (!value) return 0; //duplicate is default
+static NR::FilterConvolveMatrixEdgeMode sp_feConvolveMatrix_read_edgeMode(gchar const *value){
+    if (!value) return NR::CONVOLVEMATRIX_EDGEMODE_DUPLICATE; //duplicate is default
     switch(value[0]){
         case 'd':
-            if (strncmp(value, "duplicate", 9) == 0) return 0;
+            if (strncmp(value, "duplicate", 9) == 0) return NR::CONVOLVEMATRIX_EDGEMODE_DUPLICATE;
             break;
         case 'w':
-            if (strncmp(value, "wrap", 4) == 0) return 1;
+            if (strncmp(value, "wrap", 4) == 0) return NR::CONVOLVEMATRIX_EDGEMODE_WRAP;
             break;
         case 'n':
-            if (strncmp(value, "none", 4) == 0) return 2;
+            if (strncmp(value, "none", 4) == 0) return NR::CONVOLVEMATRIX_EDGEMODE_NONE;
             break;
     }
-    return 0; //duplicate is default
+    return NR::CONVOLVEMATRIX_EDGEMODE_DUPLICATE; //duplicate is default
 }
 
 /**
@@ -153,6 +158,7 @@ sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value)
     double read_num;
     int read_int;
     bool read_bool;
+    NR::FilterConvolveMatrixEdgeMode read_mode;
    
     switch(key) {
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
@@ -161,21 +167,43 @@ sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value)
             //From SVG spec: If <orderY> is not provided, it defaults to <orderX>.
             if (feConvolveMatrix->order.optNumIsSet() == false)
                 feConvolveMatrix->order.setOptNumber(feConvolveMatrix->order.getNumber());
+            if (feConvolveMatrix->targetXIsSet == false) feConvolveMatrix->targetX = (int) floor(feConvolveMatrix->order.getNumber()/2);
+            if (feConvolveMatrix->targetYIsSet == false) feConvolveMatrix->targetY = (int) floor(feConvolveMatrix->order.getOptNumber()/2);
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         case SP_ATTR_KERNELMATRIX:
-            feConvolveMatrix->kernelMatrix = read_kernel_matrix(value, (int) (feConvolveMatrix->order.getNumber() * feConvolveMatrix->order.getOptNumber()));
-            object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            if (value){
+                feConvolveMatrix->kernelMatrixIsSet = true;
+                feConvolveMatrix->kernelMatrix = helperfns_read_vector(value, (int) (feConvolveMatrix->order.getNumber() * feConvolveMatrix->order.getOptNumber()));
+                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            } else {
+                g_warning("You MUST pass a kernelMatrix parameter!");
+            }
             break;
         case SP_ATTR_DIVISOR:
-            read_num = helperfns_read_number(value);
+            if (!value){
+                read_num = 1; 
+            } else {
+                read_num = helperfns_read_number(value);
+                if (read_num == 0) {
+                    if (feConvolveMatrix->kernelMatrixIsSet){
+                        g_warning("You shouldn't pass a divisor value equal to 0! Assuming the sum of all values in kernelMatrix as the default value.");
+                        for (unsigned int i = 0; i< feConvolveMatrix->kernelMatrix.size(); i++)
+                            read_num += feConvolveMatrix->kernelMatrix[i];
+                    } else {
+                        g_warning("You shouldn't pass a divisor value equal to 0! Assuming 1 as the default value.");
+                        read_num = 1;
+                    }
+                }
+            }
             if (read_num != feConvolveMatrix->divisor){
                 feConvolveMatrix->divisor = read_num;
                 object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
         case SP_ATTR_BIAS:
-            read_num = helperfns_read_number(value);
+            read_num = 0;
+            if (value) read_num = helperfns_read_number(value);
             if (read_num != feConvolveMatrix->bias){
                 feConvolveMatrix->bias = read_num;
                 object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -183,6 +211,11 @@ sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value)
             break;
         case SP_ATTR_TARGETX:
             read_int = (int) helperfns_read_number(value);
+            if (read_int < 0 || read_int > feConvolveMatrix->order.getNumber()){
+                g_warning("targetX must be a value between 0 and orderX! Assuming orderX as default value.");
+                read_int = (int) feConvolveMatrix->order.getNumber();
+            }
+            feConvolveMatrix->targetXIsSet = true;
             if (read_int != feConvolveMatrix->targetX){
                 feConvolveMatrix->targetX = read_int;
                 object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -190,20 +223,28 @@ sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value)
             break;
         case SP_ATTR_TARGETY:
             read_int = (int) helperfns_read_number(value);
+            if (read_int < 0 || read_int > feConvolveMatrix->order.getOptNumber()){
+                g_warning("targetY must be a value between 0 and orderY! Assuming orderY as default value.");
+                read_int = (int) feConvolveMatrix->order.getOptNumber();
+            }
+            feConvolveMatrix->targetYIsSet = true;
             if (read_int != feConvolveMatrix->targetY){
                 feConvolveMatrix->targetY = read_int;
                 object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
         case SP_ATTR_EDGEMODE:
-            read_int = (int) sp_feConvolveMatrix_read_edgeMode(value);
-            if (read_int != feConvolveMatrix->edgeMode){
-                feConvolveMatrix->edgeMode = read_int;
+            read_mode = sp_feConvolveMatrix_read_edgeMode(value);
+            if (read_mode != feConvolveMatrix->edgeMode){
+                feConvolveMatrix->edgeMode = read_mode;
                 object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
         case SP_ATTR_KERNELUNITLENGTH:
             feConvolveMatrix->kernelUnitLength.set(value);
+            //From SVG spec: If the <dy> value is not specified, it defaults to the same value as <dx>.
+            if (feConvolveMatrix->kernelUnitLength.optNumIsSet() == false)
+                feConvolveMatrix->kernelUnitLength.setOptNumber(feConvolveMatrix->kernelUnitLength.getNumber());
             object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         case SP_ATTR_PRESERVEALPHA:
@@ -249,7 +290,7 @@ sp_feConvolveMatrix_write(SPObject *object, Inkscape::XML::Node *repr, guint fla
     if (flags & SP_OBJECT_WRITE_EXT) {
         if (repr) {
             // is this sane?
-            repr->mergeFrom(SP_OBJECT_REPR(object), "id");
+            //repr->mergeFrom(SP_OBJECT_REPR(object), "id");
         } else {
             repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
         }
@@ -282,6 +323,7 @@ static void sp_feConvolveMatrix_build_renderer(SPFilterPrimitive *primitive, NR:
     nr_convolve->set_kernelMatrix(sp_convolve->kernelMatrix);
     nr_convolve->set_divisor(sp_convolve->divisor);
     nr_convolve->set_bias(sp_convolve->bias);
+    nr_convolve->set_preserveAlpha(sp_convolve->preserveAlpha);
 
 }
 /*