Author: jghali
Date: Tue Jul 25 18:01:12 2017
New Revision: 22123
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22123
Log:
fix regression causing failure to load ICC profiles embedded in JPEG files
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=22123&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp
(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_jpeg.cpp Tue Jul
25 18:01:12 2017
@@ -88,11 +88,11 @@
{
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)
{
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
