non-lcms build fixes

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index b7c8c40ed8e432cd563b2bdb720f4a39e92d51b2..75757068fdfb13b7faaf741d4df58f19a42b34e4 100644 (file)
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -32,8 +32,10 @@ static void colorprofile_build( SPObject *object, SPDocument *document, Inkscape
 static void colorprofile_set( SPObject *object, unsigned key, gchar const *value );
 static Inkscape::XML::Node *colorprofile_write( SPObject *object, Inkscape::XML::Node *repr, guint flags );
 
+#if ENABLE_LCMS
 static cmsHPROFILE colorprofile_get_system_profile_handle();
 static cmsHPROFILE colorprofile_get_proof_profile_handle();
+#endif // ENABLE_LCMS
 }
 
 #ifdef DEBUG_LCMS

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 2f103074698bd14f066301738b55556c3bef1a01..14fa795fc9e131d6050127dc01cd9df599af7b15 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -732,9 +732,11 @@ void InkscapePreferences::initPageCMS()
 #else
     // disable it, but leave it visible
     _misc_cms_display.set_sensitive( false );
+    _misc_cms_intent.set_sensitive( false );
     _misc_cms_display_profile.set_sensitive( false );
     _misc_cms_softproof.set_sensitive( false );
     _misc_cms_gamutwarn.set_sensitive( false );
+    _misc_cms_proof_intent.set_sensitive( false );
     _misc_cms_proof_profile.set_sensitive( false );
 #endif // ENABLE_LCMS
 

diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 9e4edc5344cc4d9bdb866c4a45b66d8980efddd7..b4fff1d3f1a1fa586b49331ddf87fd31b1b4823a 100644 (file)
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -488,7 +488,8 @@ void ColorICCSelector::_colorChanged( const SPColor& color, gfloat alpha )
             //g_message("Color needs to change 0x%06x to 0x%06x", color.toRGBA32(255) >> 8, other >> 8 );
         }
     }
-
+#else
+    (void)color;
 #endif // ENABLE_LCMS
     _updateSliders( -1 );
 
@@ -659,6 +660,8 @@ void ColorICCSelector::_updateSliders( gint ignore )
             }
         }
     }
+#else
+    (void)ignore;
 #endif // ENABLE_LCMS
 
     guint32 start = _color.toRGBA32( 0x00 );
@@ -698,6 +701,7 @@ void ColorICCSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorICC
          g_message("ALPHA");
 #endif // DEBUG_LCMS
      } else {
+#if ENABLE_LCMS
          for ( guint i = 0; i < iccSelector->_fooCount; i++ ) {
              if ( iccSelector->_fooAdj[i] == adjustment ) {
                  match = i;
@@ -746,7 +750,7 @@ void ColorICCSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorICC
                  newColor.icc->colors.push_back( val );
              }
          }
-
+#endif // ENABLE_LCMS
      }
      iccSelector->_updateInternals( newColor, scaled, iccSelector->_dragging );
      iccSelector->_updateSliders( match );