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/svg | |
| 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/svg')
| -rw-r--r-- | src/svg/svg-color.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index a8dff0bf0..705e2a76f 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -29,13 +29,13 @@ #include "svg-color.h" #include "svg-icc-color.h" -#if ENABLE_LCMS +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) #include "color.h" #include "color-profile.h" #include "document.h" #include "inkscape.h" #include "profile-manager.h" -#endif // ENABLE_LCMS +#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) #include "cms-system.h" using std::sprintf; @@ -457,7 +457,7 @@ sp_svg_create_color_hash() return colors; } -#if ENABLE_LCMS +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) //helper function borrowed from src/widgets/sp-color-icc-selector.cpp: void getThings( Inkscape::ColorProfile *prof, gchar const**& namers, gchar const**& tippies, guint const*& scalies ); @@ -493,7 +493,7 @@ g_message("transform to sRGB done"); } } } -#endif //ENABLE_LCMS +#endif //defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) /* * Some discussion at http://markmail.org/message/bhfvdfptt25kgtmj |