r21036 by jghali -

[scribus-commit]

Author: jghali
Date: Wed Feb 24 23:02:43 2016
New Revision: 21036

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21036
Log:
#13757: CMYK jpeg file not imported properly

Modified:
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21036&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp	Wed Feb 24 23:02:43 2016
@@ -404,7 +404,7 @@
 		if ( cinfo.output_components == 4 )
 		{
 			int method = 0;
-			if (cinfo.jpeg_color_space == JCS_YCCK)
+			if ((cinfo.jpeg_color_space == JCS_YCCK) || (cinfo.out_color_space == JCS_CMYK))
 				method = 1;
 			else if (fromPS)
 			{