Filters. Custom predefined filters update and new ABC filters.

[inkscape.git] / src / svg / svg-color.cpp

diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index d6b33402faba8da0dd29e7ee00e73864b5ea8cd2..e50cb2928fd6208317401567659cad3ed9c028c8 100644 (file)
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -350,9 +350,9 @@ sp_svg_read_color(gchar const *str, gchar const **end_ptr, guint32 dfl)
      * this check wrapper. */
     gchar const *end = str;
     guint32 const ret = internal_sp_svg_read_color(str, &end, dfl);
-    assert(ret == dfl && end == str
+    assert(((ret == dfl) && (end == str))
            || (((ret & 0xff) == 0)
-               && str < end));
+               && (str < end)));
     if (str < end) {
         gchar *buf = (gchar *) g_malloc(end + 1 - str);
         memcpy(buf, str, end - str);
@@ -463,6 +463,7 @@ sp_svg_create_color_hash()
     return colors;
 }
 
+#if ENABLE_LCMS
 //helper function borrowed from src/widgets/sp-color-icc-selector.cpp:
 void getThings( DWORD space, gchar const**& namers, gchar const**& tippies, guint const*& scalies );
 
@@ -496,6 +497,7 @@ g_message("transform to sRGB done");
         }
     }
 }
+#endif //ENABLE_LCMS
 
 /*
  * Some discussion at http://markmail.org/message/bhfvdfptt25kgtmj
@@ -558,7 +560,6 @@ bool sp_svg_read_icc_color( gchar const *str, gchar const **end_ptr, SVGICCColor
                     if ( !errno ) {
                         if ( dest ) {
                             dest->colors.push_back( dbl );
-g_message("color: %f", dbl);
                         }
                         str = endPtr;
                     } else {
@@ -604,6 +605,7 @@ bool sp_svg_read_icc_color( gchar const *str, SVGICCColor* dest )
     return sp_svg_read_icc_color(str, NULL, dest);
 }
 
+
 /*
   Local Variables:
   mode:c++
@@ -613,4 +615,4 @@ bool sp_svg_read_icc_color( gchar const *str, SVGICCColor* dest )
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :