Update to trunk r13621

(bzr r13341.1.278)

3 files changed, 47 insertions, 30 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index fd5a9871e..ca1d5bf96 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -183,6 +183,8 @@ void SPFeBlend::update(SPCtx *ctx, guint flags) {
 
     /* Unlike normal in, in2 is required attribute. Make sure, we can call
      * it by some name. */
+    /* This may not be true.... see issue at 
+     * http://www.w3.org/TR/filter-effects/#feBlendElement (but it doesn't hurt). */
     if (this->in2 == Inkscape::Filters::NR_FILTER_SLOT_NOT_SET ||
         this->in2 == Inkscape::Filters::NR_FILTER_UNNAMED_SLOT)
     {
@@ -206,26 +208,30 @@ Inkscape::XML::Node* SPFeBlend::write(Inkscape::XML::Document *doc, Inkscape::XM
         repr = doc->createElement("svg:feBlend");
     }
 
-    gchar const *out_name = sp_filter_name_for_image(parent, this->in2);
+    gchar const *in2_name = sp_filter_name_for_image(parent, this->in2);
 
-    if (out_name) {
-        repr->setAttribute("in2", out_name);
-    } else {
+    if( !in2_name ) {
+
+        // This code is very similar to sp_filter_primtive_name_previous_out()
         SPObject *i = parent->children;
 
+        // Find previous filter primitive
         while (i && i->next != this) {
         	i = i->next;
         }
 
-        SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
-        out_name = sp_filter_name_for_image(parent, i_prim->image_out);
-        repr->setAttribute("in2", out_name);
-
-        if (!out_name) {
-            g_warning("Unable to set in2 for feBlend");
+        if( i ) {
+            SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
+            in2_name = sp_filter_name_for_image(parent, i_prim->image_out);
         }
     }
 
+    if (in2_name) {
+        repr->setAttribute("in2", in2_name);
+    } else {
+        g_warning("Unable to set in2 for feBlend");
+    }
+
     char const *mode;
     switch(this->blend_mode) {
         case Inkscape::Filters::BLEND_NORMAL:
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index 257292f12..e600b6d20 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -205,6 +205,8 @@ void SPFeComposite::update(SPCtx *ctx, guint flags) {
 
     /* Unlike normal in, in2 is required attribute. Make sure, we can call
      * it by some name. */
+    /* This may not be true.... see issue at 
+     * http://www.w3.org/TR/filter-effects/#feBlendElement (but it doesn't hurt). */
     if (this->in2 == Inkscape::Filters::NR_FILTER_SLOT_NOT_SET ||
         this->in2 == Inkscape::Filters::NR_FILTER_UNNAMED_SLOT)
     {
@@ -228,26 +230,30 @@ Inkscape::XML::Node* SPFeComposite::write(Inkscape::XML::Document *doc, Inkscape
         repr = doc->createElement("svg:feComposite");
     }
 
-    gchar const *out_name = sp_filter_name_for_image(parent, this->in2);
+    gchar const *in2_name = sp_filter_name_for_image(parent, this->in2);
 
-    if (out_name) {
-        repr->setAttribute("in2", out_name);
-    } else {
+    if( !in2_name ) {
+
+        // This code is very similar to sp_filter_primitive_name_previous_out()
         SPObject *i = parent->children;
 
+        // Find previous filter primitive
         while (i && i->next != this) {
         	i = i->next;
         }
 
-        SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
-        out_name = sp_filter_name_for_image(parent, i_prim->image_out);
-        repr->setAttribute("in2", out_name);
-
-        if (!out_name) {
-            g_warning("Unable to set in2 for feComposite");
+        if( i ) {
+            SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
+            in2_name = sp_filter_name_for_image(parent, i_prim->image_out);
         }
     }
 
+    if (in2_name) {
+        repr->setAttribute("in2", in2_name);
+    } else {
+        g_warning("Unable to set in2 for feComposite");
+    }
+
     char const *comp_op;
 
     switch (this->composite_operator) {
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index 473e4913f..7dedfc031 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -202,25 +202,30 @@ Inkscape::XML::Node* SPFeDisplacementMap::write(Inkscape::XML::Document *doc, In
         repr = doc->createElement("svg:feDisplacementMap");
     }
 
-    gchar const *out_name = sp_filter_name_for_image(parent, this->in2);
-    if (out_name) {
-        repr->setAttribute("in2", out_name);
-    } else {
+    gchar const *in2_name = sp_filter_name_for_image(parent, this->in2);
+
+    if( !in2_name ) {
+
+        // This code is very similar to sp_filter_primtive_name_previous_out()
         SPObject *i = parent->children;
 
+        // Find previous filter primitive
         while (i && i->next != this) {
         	i = i->next;
         }
 
-        SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
-        out_name = sp_filter_name_for_image(parent, i_prim->image_out);
-        repr->setAttribute("in2", out_name);
-
-        if (!out_name) {
-            g_warning("Unable to set in2 for feDisplacementMap");
+        if( i ) {
+            SPFilterPrimitive *i_prim = SP_FILTER_PRIMITIVE(i);
+            in2_name = sp_filter_name_for_image(parent, i_prim->image_out);
         }
     }
 
+    if (in2_name) {
+        repr->setAttribute("in2", in2_name);
+    } else {
+        g_warning("Unable to set in2 for feDisplacementMap");
+    }
+
     sp_repr_set_svg_double(repr, "scale", this->scale);
     repr->setAttribute("xChannelSelector",
                        get_channelselector_name(this->xChannelSelector));