Fix compile with lcms disabled.

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 2aec6c2f001c97c932072e01e6a6e4cf44573190..5a2a1efc9d57086a6e71161bb58fe3617784f6d3 100644 (file)
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -562,6 +562,7 @@ Glib::ustring Inkscape::get_path_for_profile(Glib::ustring const& name)
     return result;
 }
 
+#if ENABLE_LCMS
 std::list<gchar *> ColorProfile::getProfileDirs() {
     std::list<gchar *> sources;
 
@@ -586,6 +587,7 @@ std::list<gchar *> ColorProfile::getProfileDirs() {
 
     return sources;
 }
+#endif // ENABLE_LCMS
 
 static void findThings() {
     std::list<gchar *> sources = ColorProfile::getProfileDirs();

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index a5fafd482831fbb134791cf897be51d9e2cc5ea7..84e41289dfb88782be18b9074e0b5e0394cd3516 100644 (file)
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -789,8 +789,10 @@ DocumentProperties::update()
 
     //------------------------------------------------Color Management page
 
+#if ENABLE_LCMS
     populate_embedded_profiles_box();
     populate_available_profiles();
+#endif // ENABLE_LCMS
 
     _wr.setUpdating (false);
 }

diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 162618c05445f479fba04df3acde686e18eb11c7..5dd69385cae41c13d5141759250d229594824461 100644 (file)
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -57,13 +57,15 @@ protected:
 #endif // ENABLE_LCMS
     void  init();
 
+    virtual void  on_response (int);
+#if ENABLE_LCMS
     void  populate_available_profiles();
     void  populate_embedded_profiles_box();
-    virtual void  on_response (int);
     void  onEmbedProfile();
     void  remove_profile();
     void  embedded_profiles_list_button_release(GdkEventButton* event);
     void  create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem);
+#endif // ENABLE_LCMS
 
     void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
     void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index cfca212472bd99437413d7bb7778c7b6d7c73d91..43d1ea88cd8f71d7bb714f087b8356ec15a436a5 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -816,6 +816,7 @@ void InkscapePreferences::initPageCMS()
 
     _page_cms.add_group_header( _("Display adjustment"));
 
+#if ENABLE_LCMS
     Glib::ustring tmpStr;
     std::list<gchar *> sources = ColorProfile::getProfileDirs();
     while (!sources.empty()) {
@@ -832,6 +833,7 @@ void InkscapePreferences::initPageCMS()
                         profileTip, false);
     g_free(profileTip);
     profileTip = 0;
+#endif // ENABLE_LCMS
 
     _cms_from_display.init( _("Retrieve profile from display"), "/options/displayprofile/from_display", false);
     _page_cms.add_line( false, "", _cms_from_display, "",