Merge trunk

(bzr r14950.1.20)

1 files changed, 12 insertions, 48 deletions

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index aea9ccab0..51b1505c5 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -4,13 +4,8 @@
 
 #define noDEBUG_LCMS
 
-#if WITH_GTKMM_3_0
-# include <gdkmm/rgba.h>
-#else
-# include <gdkmm/color.h>
-#endif
+#include <gdkmm/rgba.h>
 
-#include <glibmm/checksum.h>
 #include <glib/gstdio.h>
 #include <fcntl.h>
 #include <glib/gi18n.h>
@@ -21,7 +16,6 @@
 
 #include <unistd.h>
 #include <cstring>
-#include <string>
 #include <io/sys.h>
 
 #ifdef WIN32
@@ -46,15 +40,14 @@
 #include "inkscape.h"
 #include "document.h"
 #include "preferences.h"
-
+#include <glibmm/checksum.h>
+#include <glibmm/convert.h>
 #include "uri.h"
 
 #ifdef WIN32
 #include <icm.h>
 #endif // WIN32
 
-#include <glibmm/convert.h>
-
 using Inkscape::ColorProfile;
 using Inkscape::ColorProfileImpl;
 
@@ -589,9 +582,9 @@ bool ColorProfile::GamutCheck(SPColor color)
         static_cast<guchar>(SP_RGBA32_B_U(val)),
         255};
 
-    cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck();

-    if (gamutCheck) {

-        cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1);

+    cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck();
+    if (gamutCheck) {
+        cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1);
     }
 
 #if HAVE_LIBLCMS1
@@ -620,8 +613,6 @@ private:
     cmsProfileClassSignature _profileClass;
 };
 
-#include <iostream>
-
 ProfileInfo::ProfileInfo( cmsHPROFILE prof, Glib::ustring const & path ) :
     _path( path ),
     _name( getNameFromProfile(prof) ),
@@ -1002,11 +993,7 @@ void loadProfiles()
 
 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)
@@ -1152,12 +1139,7 @@ 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)
@@ -1189,15 +1171,9 @@ cmsHTRANSFORM Inkscape::CMSSystem::getDisplayTransform()
             if ( gamutWarn ) {
                 dwFlags |= cmsFLAGS_GAMUTCHECK;
 
-#if WITH_GTKMM_3_0
-                gushort gamutColor_r = gamutColor.get_red_u();
-                gushort gamutColor_g = gamutColor.get_green_u();
-                gushort gamutColor_b = gamutColor.get_blue_u();
-#else
-                gushort gamutColor_r = gamutColor.get_red();
-                gushort gamutColor_g = gamutColor.get_green();
-                gushort gamutColor_b = gamutColor.get_blue();
-#endif
+                auto gamutColor_r = gamutColor.get_red_u();
+                auto gamutColor_g = gamutColor.get_green_u();
+                auto gamutColor_b = gamutColor.get_blue_u();
 
 #if HAVE_LIBLCMS1
                 cmsSetAlarmCodes(gamutColor_r >> 8, gamutColor_g >> 8, gamutColor_b >> 8);
@@ -1338,12 +1314,7 @@ 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)
@@ -1373,16 +1344,9 @@ cmsHTRANSFORM Inkscape::CMSSystem::getDisplayPer( Glib::ustring const& id )
                         cmsUInt32Number dwFlags = cmsFLAGS_SOFTPROOFING;
                         if ( gamutWarn ) {
                             dwFlags |= cmsFLAGS_GAMUTCHECK;
-
-#if WITH_GTKMM_3_0
-                            gushort gamutColor_r = gamutColor.get_red_u();
-                            gushort gamutColor_g = gamutColor.get_green_u();
-                            gushort gamutColor_b = gamutColor.get_blue_u();
-#else
-                            gushort gamutColor_r = gamutColor.get_red();
-                            gushort gamutColor_g = gamutColor.get_green();
-                            gushort gamutColor_b = gamutColor.get_blue();
-#endif
+                            auto gamutColor_r = gamutColor.get_red_u();
+                            auto gamutColor_g = gamutColor.get_green_u();
+                            auto gamutColor_b = gamutColor.get_blue_u();
 
 #if HAVE_LIBLCMS1
                             cmsSetAlarmCodes(gamutColor_r >> 8, gamutColor_g >> 8, gamutColor_b >> 8);