diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-16 10:05:16 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-16 10:05:16 +0000 |
| commit | 098590935052a42027c47f8635ae6f11cf35503b (patch) | |
| tree | 141ba0f404001acb91e6b173360c4485c453a0c8 /src/color-profile.cpp | |
| parent | fixing bend warnings (diff) | |
| parent | add (commented-out) flag for C++11 compilation. (note that on Windows we use ... (diff) | |
| download | inkscape-098590935052a42027c47f8635ae6f11cf35503b.tar.gz inkscape-098590935052a42027c47f8635ae6f11cf35503b.zip | |
Update to trunk
(bzr r12588.1.17)
Diffstat (limited to 'src/color-profile.cpp')
| -rw-r--r-- | src/color-profile.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index e6a9ac71c..f0a06f73b 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -4,7 +4,12 @@ #define noDEBUG_LCMS -#include <gdkmm/color.h> +#if WITH_GTKMM_3_0 +# include <gdkmm/rgba.h> +#else +# include <gdkmm/color.h> +#endif + #include <glibmm/checksum.h> #include <glib/gstdio.h> #include <fcntl.h> @@ -973,7 +978,13 @@ void loadProfiles() } // namespace static bool gamutWarn = false; + +#if WITH_GTKMM_3_0 +static Gdk::RGBA lastGamutColor("#808080"); +#else static Gdk::Color lastGamutColor("#808080"); +#endif + static bool lastBPC = false; #if defined(cmsFLAGS_PRESERVEBLACK) static bool lastPreserveBlack = false; @@ -1118,7 +1129,12 @@ cmsHTRANSFORM Inkscape::CMSSystem::getDisplayTransform() bool preserveBlack = prefs->getBool( "/options/softproof/preserveblack"); #endif //defined(cmsFLAGS_PRESERVEBLACK) Glib::ustring colorStr = prefs->getString("/options/softproof/gamutcolor"); + +#if WITH_GTKMM_3_0 + Gdk::RGBA gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#else Gdk::Color gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#endif if ( (warn != gamutWarn) || (lastIntent != intent) @@ -1288,7 +1304,12 @@ cmsHTRANSFORM Inkscape::CMSSystem::getDisplayPer( Glib::ustring const& id ) bool preserveBlack = prefs->getBool( "/options/softproof/preserveblack"); #endif //defined(cmsFLAGS_PRESERVEBLACK) Glib::ustring colorStr = prefs->getString("/options/softproof/gamutcolor"); + +#if WITH_GTKMM_3_0 + Gdk::RGBA gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#else Gdk::Color gamutColor( colorStr.empty() ? "#808080" : colorStr ); +#endif if ( (warn != gamutWarn) || (lastIntent != intent) |