diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-11-27 15:07:14 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-11-27 15:07:14 +0000 |
| commit | 85b8111665b6e73bd310352a1430f2307f372ed9 (patch) | |
| tree | 8049a22b6f9432d86ed80c70adbae5d582904f2a /src | |
| parent | List color profile search locations in preference tooltip (diff) | |
| download | inkscape-85b8111665b6e73bd310352a1430f2307f372ed9.tar.gz inkscape-85b8111665b6e73bd310352a1430f2307f372ed9.zip | |
Fix compile with lcms disabled.
(bzr r6909)
Diffstat (limited to 'src')
| -rw-r--r-- | src/color-profile.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/document-properties.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/document-properties.h | 4 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 2aec6c2f0..5a2a1efc9 100644 --- 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 a5fafd482..84e41289d 100644 --- 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 162618c05..5dd69385c 100644 --- 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 cfca21247..43d1ea88c 100644 --- 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, "", |