diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2012-05-23 05:09:20 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2012-05-23 05:09:20 +0000 |
| commit | 1b002643272c7d6f5e5a94ed349c0b1990005630 (patch) | |
| tree | cf70d464a995619d2a7249feafdb2b3ee6d5a1c1 /src | |
| parent | More GTK+ 3 fixes for desktop-widget (diff) | |
| download | inkscape-1b002643272c7d6f5e5a94ed349c0b1990005630.tar.gz inkscape-1b002643272c7d6f5e5a94ed349c0b1990005630.zip | |
Correct improper flipping of sRGB transform from RGB to BGR with cairo change. Fixes bug #814179.
Fixed bugs:
- https://launchpad.net/bugs/814179
(bzr r11405)
Diffstat (limited to 'src')
| -rw-r--r-- | src/color-profile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 0ee3ed787..a1e9dd0f1 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -10,7 +10,7 @@ #include <glib/gi18n.h> #ifdef DEBUG_LCMS -#include <gtk.h> +#include <gtk/gtk.h> #endif // DEBUG_LCMS #include <cstring> @@ -588,7 +588,7 @@ cmsHTRANSFORM ColorProfile::getTransfToSRGB8() { if ( !impl->_transf && impl->_profHandle ) { int intent = getLcmsIntent(rendering_intent); - impl->_transf = cmsCreateTransform( impl->_profHandle, ColorProfileImpl::_getInputFormat(impl->_profileSpace), ColorProfileImpl::getSRGBProfile(), TYPE_BGRA_8, intent, 0 ); + impl->_transf = cmsCreateTransform( impl->_profHandle, ColorProfileImpl::_getInputFormat(impl->_profileSpace), ColorProfileImpl::getSRGBProfile(), TYPE_RGBA_8, intent, 0 ); } return impl->_transf; } @@ -597,7 +597,7 @@ cmsHTRANSFORM ColorProfile::getTransfFromSRGB8() { if ( !impl->_revTransf && impl->_profHandle ) { int intent = getLcmsIntent(rendering_intent); - impl->_revTransf = cmsCreateTransform( ColorProfileImpl::getSRGBProfile(), TYPE_BGRA_8, impl->_profHandle, ColorProfileImpl::_getInputFormat(impl->_profileSpace), intent, 0 ); + impl->_revTransf = cmsCreateTransform( ColorProfileImpl::getSRGBProfile(), TYPE_RGBA_8, impl->_profHandle, ColorProfileImpl::_getInputFormat(impl->_profileSpace), intent, 0 ); } return impl->_revTransf; } |