diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2012-02-13 09:27:56 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2012-02-13 09:27:56 +0000 |
| commit | 33e08823fec6157953453a938b10e2c731c8e1df (patch) | |
| tree | f0c0214357fb5faeef6e2214d075384e72eccb8f /src/widgets/sp-color-notebook.cpp | |
| parent | Fix wrong placement in authors (diff) | |
| download | inkscape-33e08823fec6157953453a938b10e2c731c8e1df.tar.gz inkscape-33e08823fec6157953453a938b10e2c731c8e1df.zip | |
Enable LCMS2 for other than OSX, where it still has some issues. Fixes bug #885324.
Fixed bugs:
- https://launchpad.net/bugs/885324
(bzr r10969)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index 1324e0b16..2fbf6a763 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -208,9 +208,9 @@ void ColorNotebook::init() /* tempory hardcoding to get types loaded */ SP_TYPE_COLOR_SCALES; SP_TYPE_COLOR_WHEEL_SELECTOR; -#if ENABLE_LCMS +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) SP_TYPE_COLOR_ICC_SELECTOR; -#endif // ENABLE_LCMS +#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) /* REJON: Comment out the next line to not use the normal GTK Color wheel. */ @@ -331,7 +331,7 @@ void ColorNotebook::init() GtkWidget *rgbabox = gtk_hbox_new (FALSE, 0); -#if ENABLE_LCMS +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) /* Create color management icons */ _box_colormanaged = gtk_event_box_new (); GtkWidget *colormanaged = gtk_image_new_from_icon_name ("color-management-icon", GTK_ICON_SIZE_SMALL_TOOLBAR); @@ -354,7 +354,7 @@ void ColorNotebook::init() gtk_widget_set_sensitive (_box_toomuchink, false); gtk_box_pack_start(GTK_BOX(rgbabox), _box_toomuchink, FALSE, FALSE, 2); -#endif //ENABLE_LCMS +#endif //defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) /* Create RGBA entry and color preview */ _rgbal = gtk_label_new_with_mnemonic (_("RGBA_:")); @@ -372,10 +372,10 @@ void ColorNotebook::init() sp_set_font_size_smaller (rgbabox); gtk_widget_show_all (rgbabox); -#if ENABLE_LCMS +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) //the "too much ink" icon is initially hidden gtk_widget_hide(GTK_WIDGET(_box_toomuchink)); -#endif //ENABLE_LCMS +#endif //defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) gtk_table_attach (GTK_TABLE (table), rgbabox, 0, 2, row, row + 1, GTK_FILL, GTK_SHRINK, XPAD, YPAD); @@ -522,7 +522,7 @@ void ColorNotebook::_updateRgbaEntry( const SPColor& color, gfloat alpha ) { g_return_if_fail( ( 0.0 <= alpha ) && ( alpha <= 1.0 ) ); -#if ENABLE_LCMS +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) /* update color management icon*/ gtk_widget_set_sensitive (_box_colormanaged, color.icc != NULL); @@ -554,7 +554,7 @@ void ColorNotebook::_updateRgbaEntry( const SPColor& color, gfloat alpha ) gtk_widget_hide(GTK_WIDGET(_box_toomuchink)); } } -#endif //ENABLE_LCMS +#endif //defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) if ( !_updatingrgba ) { |