r22122 by jghali -

[scribus-commit]

Author: jghali
Date: Tue Jul 25 18:00:39 2017
New Revision: 22122

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22122
Log:
fix regression causing failure to load ICC profiles embedded in JPEG files

Modified:
    branches/Version14x/Scribus/scribus/scimgdataloader_jpeg.cpp

Modified: branches/Version14x/Scribus/scribus/scimgdataloader_jpeg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22122&path=/branches/Version14x/Scribus/scribus/scimgdataloader_jpeg.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scimgdataloader_jpeg.cpp	(original)
+++ branches/Version14x/Scribus/scribus/scimgdataloader_jpeg.cpp	Tue Jul 25 18:00:39 2017
@@ -89,11 +89,11 @@
 			// and image data are not consistent, discard embedded profile.
 			eColorSpaceType colorSpace = prof.colorSpace();
 			if (colorSpace == ColorSpace_Rgb)
-				profileIsValid = (cinfo.output_components == 3);
+				profileIsValid = (cinfo.num_components == 3);
 			if (colorSpace == ColorSpace_Cmyk)
-				profileIsValid = (cinfo.output_components == 4);
+				profileIsValid = (cinfo.num_components == 4);
 			if (colorSpace == ColorSpace_Gray)
-				profileIsValid = (cinfo.output_components == 1);
+				profileIsValid = (cinfo.num_components == 1);
 		}
 		if (profileIsValid)
 		{