r15132 by jghali - update graphicsmagick image loader vs latest changes in image loading code

scribus-commit scribus-commit at lists.scribus.net
Fri May 28 19:30:20 CEST 2010


Revision: 15132
Author: jghali
Date: 2010-05-28T17:23:52.093787Z
Commit message: update graphicsmagick image loader vs latest changes in image loading code

Changeset: 
M  /trunk/Scribus/scribus/scimgdataloader_gmagick.cpp

Diffs:
Index: scribus/scimgdataloader_gmagick.cpp
===================================================================
--- scribus/scimgdataloader_gmagick.cpp	(revision 15131)
+++ scribus/scimgdataloader_gmagick.cpp	(revision 15132)
@@ -216,11 +216,13 @@
 			m_useRawImage = true;
 			if (!read_cmyk(&image, &r_image, width, height)) return false;
 			m_imageInfoRecord.colorspace = ColorSpaceCMYK;
+			m_pixelFormat = (r_image.channels() == 5) ? Format_CMYKA_8 : Format_CMYK_8;
 		} else {
 			m_useRawImage = false;
 			m_image = QImage(width, height, QImage::Format_ARGB32);
 			if (!read_rgb(&image, &m_image, width, height)) return false;
 			m_imageInfoRecord.colorspace = ColorSpaceRGB;
+			m_pixelFormat = Format_BGRA_8;
 		}
 		m_imageInfoRecord.type = ImageTypeOther;
 		m_imageInfoRecord.exifDataValid = false;




More information about the scribus-commit mailing list