diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-05-23 16:39:31 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-05-23 16:39:31 +0000 |
| commit | 9b2ac3c3db9d7ee775049bc5739d3355b49b9bfd (patch) | |
| tree | c7705bd2e3ceffef95a7c6842912d4daa2b9979a | |
| parent | enable palette (diff) | |
| download | inkscape-9b2ac3c3db9d7ee775049bc5739d3355b49b9bfd.tar.gz inkscape-9b2ac3c3db9d7ee775049bc5739d3355b49b9bfd.zip | |
Flipped LCMS on
(bzr r981)
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/dialogs/swatches.cpp | 10 | ||||
| -rw-r--r-- | src/interface.cpp | 8 |
3 files changed, 12 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index ac889fef3..0a5a6dffc 100644 --- a/configure.ac +++ b/configure.ac @@ -427,8 +427,8 @@ dnl LittleCms checking dnl ****************************** AC_ARG_ENABLE(lcms, - AC_HELP_STRING([--enable-lcms], [enable LittleCms for color management (disabled by default)]), - [enable_lcms=$enableval], [enable_lcms=no]) + AC_HELP_STRING([--enable-lcms], [enable LittleCms for color management]), + [enable_lcms=$enableval], [enable_lcms=yes]) if test "x$enable_lcms" = "xno"; then dnl Asked to ignore LittleCms diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index dc9b6fdd6..dc9de8d2b 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -98,10 +98,10 @@ typedef enum { } colorFlavorType; static const GtkTargetEntry sourceColorEntries[] = { -#if ENABLE_LCMS +#if ENABLE_MAGIC_COLORS // {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, {"application/x-inkscape-color", 0, APP_X_INKY_COLOR}, -#endif // ENABLE_LCMS +#endif // ENABLE_MAGIC_COLORS {"application/x-color", 0, APP_X_COLOR}, {"text/plain", 0, TEXT_DATA}, }; @@ -234,10 +234,10 @@ static void dieDieDie( GtkObject *obj, gpointer user_data ) } static const GtkTargetEntry destColorTargets[] = { -#if ENABLE_LCMS +#if ENABLE_MAGIC_COLORS // {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, {"application/x-inkscape-color", 0, APP_X_INKY_COLOR}, -#endif // ENABLE_LCMS +#endif // ENABLE_MAGIC_COLORS {"application/x-color", 0, APP_X_COLOR}, }; @@ -837,7 +837,9 @@ void _loadPaletteFile( gchar const *filename ) } while ( result && !hasErr ); if ( !hasErr ) { possible.push_back(onceMore); +#if ENABLE_MAGIC_COLORS ColorItem::_wireMagicColors( onceMore ); +#endif ENABLE_MAGIC_COLORS } else { delete onceMore; } diff --git a/src/interface.cpp b/src/interface.cpp index c5d893ede..959e231e2 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -88,9 +88,9 @@ static GtkTargetEntry ui_drop_target_entries [] = { {"image/svg", 0, SVG_DATA}, {"image/png", 0, PNG_DATA}, {"image/jpeg", 0, JPEG_DATA}, -#if ENABLE_LCMS +#if ENABLE_MAGIC_COLORS {"application/x-inkscape-color", 0, APP_X_INKY_COLOR}, -#endif // ENABLE_LCMS +#endif // ENABLE_MAGIC_COLORS {"application/x-color", 0, APP_X_COLOR} }; @@ -978,7 +978,7 @@ sp_ui_drag_data_received(GtkWidget *widget, gpointer user_data) { switch (info) { -#if ENABLE_LCMS +#if ENABLE_MAGIC_COLORS case APP_X_INKY_COLOR: { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -1052,7 +1052,7 @@ sp_ui_drag_data_received(GtkWidget *widget, } } break; -#endif // ENABLE_LCMS +#endif // ENABLE_MAGIC_COLORS case APP_X_COLOR: { |