diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-10-16 16:13:03 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-10-16 16:13:03 +0000 |
| commit | 0cee3b79d02c11a673809c13c0570be715ea613f (patch) | |
| tree | 0a0159d693398f46782eaa4b196c51bd242e642f /src/color-profile.cpp | |
| parent | add (commented-out) flag for C++11 compilation. (note that on Windows we use ... (diff) | |
| download | inkscape-0cee3b79d02c11a673809c13c0570be715ea613f.tar.gz inkscape-0cee3b79d02c11a673809c13c0570be715ea613f.zip | |
Fix colour variable type with gtkmm 3
Fixed bugs:
- https://launchpad.net/bugs/1239370
(bzr r12694)
Diffstat (limited to 'src/color-profile.cpp')
| -rw-r--r-- | src/color-profile.cpp | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index f0a06f73b..b18112ece 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -1165,13 +1165,24 @@ cmsHTRANSFORM Inkscape::CMSSystem::getDisplayTransform() 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 + #if HAVE_LIBLCMS1 - cmsSetAlarmCodes(gamutColor.get_red() >> 8, gamutColor.get_green() >> 8, gamutColor.get_blue() >> 8); + cmsSetAlarmCodes(gamutColor_r >> 8, gamutColor_g >> 8, gamutColor_b >> 8); #elif HAVE_LIBLCMS2 cmsUInt16Number newAlarmCodes[cmsMAXCHANNELS] = {0}; - newAlarmCodes[0] = gamutColor.get_red(); - newAlarmCodes[1] = gamutColor.get_green(); - newAlarmCodes[2] = gamutColor.get_blue(); + newAlarmCodes[0] = gamutColor_r; + newAlarmCodes[1] = gamutColor_g; + newAlarmCodes[2] = gamutColor_b; newAlarmCodes[3] = ~0; cmsSetAlarmCodes(newAlarmCodes); #endif @@ -1339,13 +1350,24 @@ 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 + #if HAVE_LIBLCMS1 - cmsSetAlarmCodes(gamutColor.get_red() >> 8, gamutColor.get_green() >> 8, gamutColor.get_blue() >> 8); + cmsSetAlarmCodes(gamutColor_r >> 8, gamutColor_g >> 8, gamutColor_b >> 8); #elif HAVE_LIBLCMS2 cmsUInt16Number newAlarmCodes[cmsMAXCHANNELS] = {0}; - newAlarmCodes[0] = gamutColor.get_red(); - newAlarmCodes[1] = gamutColor.get_green(); - newAlarmCodes[2] = gamutColor.get_blue(); + newAlarmCodes[0] = gamutColor_r; + newAlarmCodes[1] = gamutColor_g; + newAlarmCodes[2] = gamutColor_b; newAlarmCodes[3] = ~0; cmsSetAlarmCodes(newAlarmCodes); #endif |