update to trunk (r13610)

(bzr r13506.1.112)

17 files changed, 142 insertions, 100 deletions

diff --git a/src/2geom/math-utils.h b/src/2geom/math-utils.h
index 83c7b4f5e..0d5d3667b 100644
--- a/src/2geom/math-utils.h
+++ b/src/2geom/math-utils.h
@@ -111,7 +111,7 @@ inline void sincos(double angle, double &sin_, double &cos_) {
 # define IS_NAN(_a) (_isnan(_a)) 	/* Win32 definition */
 #elif defined(isnan) || defined(__FreeBSD__) || defined(__osf__)
 # define IS_NAN(_a) (isnan(_a))		/* GNU definition */
-#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
+#elif defined (SOLARIS)
 # define IS_NAN(_a) (isnan(_a))		/* GNU definition */
 #else
 # define IS_NAN(_a) (boost::math::isnan(_a))
@@ -129,7 +129,7 @@ inline void sincos(double angle, double &sin_, double &cos_) {
 # define IS_FINITE(_a) (isfinite(_a))
 #elif defined(__osf__)
 # define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a))
-#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
+#elif defined (SOLARIS)
 #include  <ieeefp.h>
 #define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a))
 #else
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index 80eb69546..2ea3641dc 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -967,7 +967,7 @@ DrawingItem::_setStyleCommon(SPStyle *&_style, SPStyle *style)
     if (_style) sp_style_unref(_style);
     _style = style;
 
-    if (style->filter.set && style->getFilter()) {
+    if (style && style->filter.set && style->getFilter()) {
         if (!_filter) {
             int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
             _filter = new Inkscape::Filters::Filter(primitives);
diff --git a/src/document.cpp b/src/document.cpp
index f94a9f04f..f7edf5ed3 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -706,7 +706,12 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins)
     double const h = rect.height();
 
     double const old_height = getHeight().value("px");
-    Inkscape::Util::Unit const *px = unit_table.getUnit("px");
+    Inkscape::Util::Unit const *nv_units = unit_table.getUnit("px");
+    SPNamedView *nv = sp_document_namedview(this, NULL);
+    if (nv != NULL) {
+        if (nv->getAttribute("units"))
+            nv_units = unit_table.getUnit(nv->getAttribute("units"));
+    }
     
     /* in px */
     double margin_top = 0.0;
@@ -714,22 +719,16 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins)
     double margin_right = 0.0;
     double margin_bottom = 0.0;
     
-    SPNamedView *nv = sp_document_namedview(this, NULL);
-    
     if (with_margins && nv) {
         if (nv != NULL) {
-            gchar const * const units_abbr = nv->getAttribute("units");
-            Inkscape::Util::Unit const *margin_units = NULL;
-            if (units_abbr) {
-                margin_units = unit_table.getUnit(units_abbr);
-            }
-            if (!margin_units) {
-                margin_units = px;
-            }
-            margin_top = nv->getMarginLength("fit-margin-top",margin_units, px, w, h, false);
-            margin_left = nv->getMarginLength("fit-margin-left",margin_units, px, w, h, true);
-            margin_right = nv->getMarginLength("fit-margin-right",margin_units, px, w, h, true);
-            margin_bottom = nv->getMarginLength("fit-margin-bottom",margin_units, px, w, h, false);
+            margin_top = nv->getMarginLength("fit-margin-top", nv_units, unit_table.getUnit("px"), w, h, false);
+            margin_left = nv->getMarginLength("fit-margin-left", nv_units, unit_table.getUnit("px"), w, h, true);
+            margin_right = nv->getMarginLength("fit-margin-right", nv_units, unit_table.getUnit("px"), w, h, true);
+            margin_bottom = nv->getMarginLength("fit-margin-bottom", nv_units, unit_table.getUnit("px"), w, h, false);
+            margin_top = Inkscape::Util::Quantity::convert(margin_top, nv_units, "px");
+            margin_left = Inkscape::Util::Quantity::convert(margin_left, nv_units, "px");
+            margin_right = Inkscape::Util::Quantity::convert(margin_right, nv_units, "px");
+            margin_bottom = Inkscape::Util::Quantity::convert(margin_bottom, nv_units, "px");
         }
     }
     
@@ -738,8 +737,8 @@ void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins)
             rect.max() + Geom::Point(margin_right, margin_top));
     
     
-    setWidth(Inkscape::Util::Quantity(rect_with_margins.width(), px));
-    setHeight(Inkscape::Util::Quantity(rect_with_margins.height(), px));
+    setWidth(Inkscape::Util::Quantity(Inkscape::Util::Quantity::convert(rect_with_margins.width(), "px", nv_units), nv_units));
+    setHeight(Inkscape::Util::Quantity(Inkscape::Util::Quantity::convert(rect_with_margins.height(), "px", nv_units), nv_units));
 
     Geom::Translate const tr(
             Geom::Point(0, old_height - rect_with_margins.height())
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 0a2598c56..5bd70359f 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -59,9 +59,10 @@ guint32 ParamColor::set( guint32 in, SPDocument * /*doc*/, Inkscape::XML::Node *
     return _value;
 }
 
-ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) :
-    Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext),
-    _changeSignal(0)
+ParamColor::ParamColor(const gchar *name, const gchar *guitext, const gchar *desc, const Parameter::_scope_t scope,
+                       bool gui_hidden, const gchar *gui_tip, Inkscape::Extension::Extension *ext,
+                       Inkscape::XML::Node *xml)
+    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _value(0), _changeSignal(0)
 {
     const char * defaulthex = NULL;
     if (xml->firstChild() != NULL)
@@ -75,7 +76,8 @@ ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar *
     if (!paramval.empty())
         defaulthex = paramval.data();
 
-    _value = atoi(defaulthex);
+    if (defaulthex)
+        _value = atoi(defaulthex);
 }
 
 void ParamColor::string(std::string &string) const
@@ -87,7 +89,7 @@ void ParamColor::string(std::string &string) const
 
 Gtk::Widget *ParamColor::get_widget( SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/, sigc::signal<void> * changeSignal )
 {
-	if (_gui_hidden) return NULL;
+    if (_gui_hidden) return NULL;
 
     _changeSignal = new sigc::signal<void>(*changeSignal);
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index bb50c06e1..74b2a75ad 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -41,8 +41,8 @@ namespace Extension {
 class enumentry {
 public:
     enumentry (Glib::ustring &val, Glib::ustring &text) :
-    	value(val),
-    	guitext(text)
+        value(val),
+        guitext(text)
     {}
 
     Glib::ustring value;
@@ -50,16 +50,19 @@ public:
 };
 
 
-ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) :
-    Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _indent(0)
+ParamComboBox::ParamComboBox(const gchar *name, const gchar *guitext, const gchar *desc,
+                             const Parameter::_scope_t scope, bool gui_hidden, const gchar *gui_tip,
+                             Inkscape::Extension::Extension *ext, Inkscape::XML::Node *xml)
+    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext)
+    , _value(NULL)
+    , _indent(0)
+    , choices(NULL)
 {
-    choices = NULL;
-    _value = NULL;
+    const char *xmlval = NULL; // the value stored in XML
 
-    // Read XML tree to add enumeration items:
-    // printf("Extension Constructor: ");
     if (xml != NULL) {
-    	for (Inkscape::XML::Node *node = xml->firstChild(); node; node = node->next()) {
+        // Read XML tree to add enumeration items:
+        for (Inkscape::XML::Node *node = xml->firstChild(); node; node = node->next()) {
             char const * chname = node->name();
             if (!strcmp(chname, INKSCAPE_EXTENSION_NS "item") || !strcmp(chname, INKSCAPE_EXTENSION_NS "_item")) {
                 Glib::ustring newguitext, newvalue;
@@ -69,8 +72,8 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g
                 }
                 if (contents != NULL) {
                     // don't translate when 'item' but do translate when '_item'
-                	// NOTE: internal extensions use build_from_mem and don't need _item but
-                	//       still need to include if are to be localized
+                    // NOTE: internal extensions use build_from_mem and don't need _item but
+                    //       still need to include if are to be localized
                     if (!strcmp(chname, INKSCAPE_EXTENSION_NS "_item")) {
                         if (node->attribute("msgctxt") != NULL) {
                             newguitext =  g_dpgettext2(NULL, node->attribute("msgctxt"), contents);
@@ -95,30 +98,28 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g
                 }
             }
         }
-    }
-
-    // Initialize _value with the default value from xml
-    // for simplicity : default to the contents of the first xml-child
-    const char * defaultval = NULL;
-    if (xml->firstChild() && xml->firstChild()->firstChild()) {
-        defaultval = xml->firstChild()->attribute("value");
-    }
+    
+        // Initialize _value with the default value from xml
+        // for simplicity : default to the contents of the first xml-child
+        if (xml->firstChild() && xml->firstChild()->firstChild()) {
+            xmlval = xml->firstChild()->attribute("value");
+        }
 
-    const char * indent = xml->attribute("indent");
-    if (indent != NULL) {
-        _indent = atoi(indent) * 12;
+        const char *indent = xml->attribute("indent");
+        if (indent != NULL) {
+            _indent = atoi(indent) * 12;
+        }
     }
 
     gchar * pref_name = this->pref_name();
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name);
+    Glib::ustring paramval = prefs ? prefs->getString(extension_pref_root + pref_name) : "";
     g_free(pref_name);
 
     if (!paramval.empty()) {
-        defaultval = paramval.data();
-    }
-    if (defaultval != NULL) {
-        _value = g_strdup(defaultval);
+        _value = g_strdup(paramval.data());
+    } else if (xmlval) {
+        _value = g_strdup(xmlval);
     }
 }
 
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));
diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index 8b0b716fe..709c9e56e 100644
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -132,8 +132,8 @@ LPEVonKoch::doEffect_path (std::vector<Geom::Path> const & path_in)
     int path_in_complexity = 0;
     for (unsigned k = 0; k < path_in.size(); k++){
             path_in_complexity+=path_in[k].size();
-    }    
-    double complexity = std::pow(transforms.size(),nbgenerations)*path_in_complexity;
+    }
+    double complexity = std::pow(transforms.size(), nbgenerations) * path_in_complexity;
     if (drawall.get_value()){
         int k = transforms.size();
         if(k>1){
@@ -141,8 +141,6 @@ LPEVonKoch::doEffect_path (std::vector<Geom::Path> const & path_in)
         }else{
             complexity = nbgenerations*k*path_in_complexity;
         }
-    }else{
-        complexity = std::pow(transforms.size(),nbgenerations)*path_in_complexity;
     }
     if (complexity > double(maxComplexity)){
         g_warning("VonKoch lpe's output too complex. Effect bypassed.");
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 9ff6df3bf..2b29814b0 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -289,7 +289,7 @@ void Inkscape::ObjectSnapper::_snapNodes(IntermSnapResults &isr,
     for (std::vector<SnapCandidatePoint>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); ++k) {
         if (_allowSourceToSnapToTarget(p.getSourceType(), (*k).getTargetType(), strict_snapping)) {
             Geom::Point target_pt = (*k).getPoint();
-            Geom::Coord dist = Geom::infinity();
+            Geom::Coord dist = Geom::L2(target_pt - p.getPoint()); // Default: free (unconstrained) snapping
             if (!c.isUndefined()) {
                 // We're snapping to nodes along a constraint only, so find out if this node
                 // is at the constraint, while allowing for a small margin
@@ -299,9 +299,6 @@ void Inkscape::ObjectSnapper::_snapNodes(IntermSnapResults &isr,
                     continue;
                 }
                 dist = Geom::L2(target_pt - p_proj_on_constraint);
-            } else {
-                // Free (unconstrained) snapping
-                dist = Geom::L2(target_pt - p.getPoint());
             }
 
             if (dist < getSnapperTolerance() && dist < s.getSnapDistance()) {
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index d355b49fe..787193060 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -78,6 +78,7 @@ sp_selected_path_combine(SPDesktop *desktop)
 
     items = g_slist_sort(items, (GCompareFunc) sp_item_repr_compare_position);
     items = g_slist_reverse(items);
+    assert(items); // cannot be NULL because of list length check at top of function
 
     // remember the position, id, transform and style of the topmost path, they will be assigned to the combined one
     gint position = 0;
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index 321d2fc42..17cacbae2 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -655,9 +655,8 @@ sp_lpe_item_apply_to_mask(SPItem * item)
 {
     SPMask *mask = item->mask_ref->getObject();
     if(mask) {
-        SPObject * mask_data = mask->firstChild();
+        SPObject *mask_data = mask->firstChild();
         SPCurve * mask_curve = NULL;
-        mask_data = mask->firstChild();
         if (SP_IS_PATH(mask_data)) {
             mask_curve = SP_PATH(mask_data)->get_original_curve();
         } else if(SP_IS_SHAPE(mask_data)) {
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index a55a11403..a81a2799d 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -981,7 +981,16 @@ SPIPaint::read( gchar const *str ) {
         if (streq(str, "currentColor")) {
             set = true;
             currentcolor = true;
-            setColor( style->color.value.color );
+            if (style) {
+                setColor( style->color.value.color );
+            } else {
+                // Normally an SPIPaint is part of an SPStyle and the value of 'color' is
+                // available.  SPIPaint can be used 'stand-alone' (e.g. to parse color values) in
+                // which case a value of 'currentColor' is meaningless, thus we shouldn't reach
+                // here.
+                std::cerr << "SPIPaint::read(): value is 'currentColor' but 'color' not available." << std::endl;
+                setColor( 0 );
+            }
         } else if (streq(str, "none")) {
             set = true;
             noneSet = true;
@@ -1396,11 +1405,20 @@ SPIFilter::read( gchar const *str ) {
         set = true;
 
         // Create href if not already done.
-        if (!href && style->object) {
-            href = new SPFilterReference(style->object);
-            href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_filter_ref_changed), style));
+        if (!href) {
+            if (style->object) {
+                href = new SPFilterReference(style->object);
+            }
+            // Do we have href now?
+            if ( href ) {
+                href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_filter_ref_changed), style));
+            } else {
+                std::cerr << "SPIFilter::read(): Could not allocate 'href'" << std::endl;
+                return;
+            }
         }
 
+        // We have href
         try {
             href->attach(Inkscape::URI(uri));
         } catch (Inkscape::BadURIException &e) {
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 5108b7702..c9f22f8a4 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -511,18 +511,18 @@ sp_svg_create_color_hash()
 
 void icc_color_to_sRGB(SVGICCColor* icc, guchar* r, guchar* g, guchar* b)
 {
-    guchar color_out[4];
-    guchar color_in[4];
     if (icc) {
 g_message("profile name: %s", icc->colorProfile.c_str());
         Inkscape::ColorProfile* prof = SP_ACTIVE_DOCUMENT->profileManager->find(icc->colorProfile.c_str());
         if ( prof ) {
+            guchar color_out[4] = {0,0,0,0};
             cmsHTRANSFORM trans = prof->getTransfToSRGB8();
             if ( trans ) {
                 std::vector<colorspace::Component> comps = colorspace::getColorSpaceInfo( prof );
 
                 size_t count = CMSSystem::getChannelCount( prof );
                 size_t cap = std::min(count, comps.size());
+                guchar color_in[4];
                 for (size_t i = 0; i < cap; i++) {
                     color_in[i] = static_cast<guchar>((((gdouble)icc->colors[i]) * 256.0) * (gdouble)comps[i].scale);
                     g_message("input[%d]: %d", (int)i, (int)color_in[i]);
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index e5f18216c..9b67132c0 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -2235,7 +2235,11 @@ void CloneTiler::clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg)
     gdk_window_process_all_updates();
 
     SPObject *obj = selection->singleItem();
-    SPItem *item = SP_IS_ITEM(obj) ? SP_ITEM(obj) : 0;
+    if (!obj) {
+        // Should never happen (empty selection checked above).
+        std::cerr << "CloneTiler::clonetile_apply(): No object in single item selection!!!" << std::endl;
+        return;
+    }
     Inkscape::XML::Node *obj_repr = obj->getRepr();
     const char *id_href = g_strdup_printf("#%s", obj_repr->attribute("id"));
     SPObject *parent = obj->parent;
@@ -2326,6 +2330,7 @@ void CloneTiler::clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg)
     bool   invert_picked = prefs->getBool(prefs_path + "invert_picked");
     double gamma_picked = prefs->getDoubleLimited(prefs_path + "gamma_picked", 0, -10, 10);
 
+    SPItem *item = SP_IS_ITEM(obj) ? SP_ITEM(obj) : 0;
     if (dotrace) {
         clonetiler_trace_setup (sp_desktop_document(desktop), 1.0, item);
     }
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 0e0a4fd72..9c8d45908 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -763,6 +763,9 @@ StrokeStyle::setJoinType (unsigned const jointype)
             tb = joinBevel;
             break;
         default:
+            // Should not happen
+            std::cerr << "StrokeStyle::setJoinType(): Invalid value" << std::endl;
+            tb = joinMiter;
             break;
     }
     setJoinButtons(tb);
@@ -786,6 +789,9 @@ StrokeStyle::setCapType (unsigned const captype)
             tb = capSquare;
             break;
         default:
+            // Should not happen
+            std::cerr << "StrokeStyle::setCapType(): Invalid value" << std::endl;
+            tb = capButt;
             break;
     }
     setCapButtons(tb);
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 0319bb5e3..a4146f215 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -623,7 +623,6 @@ static Node *sp_repr_svg_read_node (Document *xml_doc, xmlNodePtr node, const gc
         repr->setContent(reinterpret_cast<gchar*>(node->content));
     }
 
-    child = node->xmlChildrenNode;
     for (child = node->xmlChildrenNode; child != NULL; child = child->next) {
         Node *crepr = sp_repr_svg_read_node (xml_doc, child, default_ns, prefix_map);
         if (crepr) {