r16352 by fschmid - ScImageLoaderPS: fixed incorrect import of CMYK DCS images.

[scribus-commit]

Author: fschmid
Date: Sun Feb 13 12:06:12 2011
New Revision: 16352

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16352
Log:
ScImageLoaderPS: fixed incorrect import of CMYK DCS images.

Modified:
    trunk/Scribus/scribus/scimgdataloader_ps.cpp

Modified: trunk/Scribus/scribus/scimgdataloader_ps.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16352&path=/trunk/Scribus/scribus/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_ps.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_ps.cpp Sun Feb 13 12:06:12 2011
@@ -696,7 +696,7 @@
 				m_imageInfoRecord.type = ImageType7;
 				m_image.setDotsPerMeterX ((int) (xres / 0.0254));
 				m_image.setDotsPerMeterY ((int) (yres / 0.0254));
-				m_pixelFormat = Format_CMYK_8;
+				m_pixelFormat = Format_YMCK_8;
 			}
 			else
 			{
@@ -774,7 +774,7 @@
 			}
 			m_imageInfoRecord.colorspace = ColorSpaceCMYK;
 			m_imageInfoRecord.type = ImageType7;
-			m_pixelFormat = Format_CMYK_8;
+			m_pixelFormat = Format_YMCK_8;
 		}
 		else
 		{
@@ -986,7 +986,7 @@
 					}
 				}
 			}
-			m_pixelFormat = Format_CMYK_8;
+			m_pixelFormat = Format_YMCK_8;
 		}
 		if ( cinfo.output_components == 1 )
 		{
@@ -1107,7 +1107,7 @@
 					}
 				}
 			}
-			m_pixelFormat = Format_CMYK_8;
+			m_pixelFormat = Format_YMCK_8;
 		}
 		if ( cinfo.output_components == 1 )
 		{
@@ -1250,7 +1250,7 @@
 				if (psMode == 4)
 				{
 					m_imageInfoRecord.colorspace = ColorSpaceCMYK;
-					m_pixelFormat = Format_CMYK_8;
+					m_pixelFormat = Format_YMCK_8;
 				}
 				else
 				{
@@ -1503,7 +1503,7 @@
 	m_imageInfoRecord.type = ImageType7;
 	m_image.setDotsPerMeterX ((int) (xres / 0.0254));
 	m_image.setDotsPerMeterY ((int) (yres / 0.0254));
-	m_pixelFormat = Format_CMYK_8;
+	m_pixelFormat = Format_YMCK_8;
 }
 
 void ScImgDataLoader_PS::loadDCS1(QString fn, int gsRes)
@@ -1604,7 +1604,7 @@
 	m_imageInfoRecord.type = ImageType7;
 	m_image.setDotsPerMeterX ((int) (xres / 0.0254));
 	m_image.setDotsPerMeterY ((int) (yres / 0.0254));
-	m_pixelFormat = Format_CMYK_8;
+	m_pixelFormat = Format_YMCK_8;
 }
 
 void ScImgDataLoader_PS::blendImages(QImage &source, ScColor col)