r16650 by jghali - #9829 : map grayscale to K channel when exporting grayscale image to 'Printer' target with color management enabled

[scribus-commit]

Author: jghali
Date: Fri Jun 10 23:00:24 2011
New Revision: 16650

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16650
Log:
#9829 : map grayscale to K channel when exporting grayscale image to 'Printer' target with color management enabled

Modified:
    branches/Version135/Scribus/scribus/scimage.cpp

Modified: branches/Version135/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16650&path=/branches/Version135/Scribus/scribus/scimage.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scimage.cpp (original)
+++ branches/Version135/Scribus/scribus/scimage.cpp Fri Jun 10 23:00:24 2011
@@ -2060,21 +2060,20 @@
 					inputProfisEmbedded = false;
 				}
 			}
+			else if (bilevel && (reqType == CMYKData))
+				inputProf = NULL; // Workaround to map directly gray to K channel
+			else if (ScCore->InputProfiles.contains(cmSettings.profileName()) && (cmSettings.profileName() != cmSettings.doc()->CMSSettings.DefaultImageRGBProfile))
+			{
+				imgInfo.profileName = cmSettings.profileName();
+				profilePath = ScCore->InputProfiles[imgInfo.profileName].toLocal8Bit();
+				inputProfisEmbedded = true;
+				inputProf = ScColorMgmtEngine::openProfileFromFile(profilePath);
+			}
 			else
 			{
-				if (ScCore->InputProfiles.contains(cmSettings.profileName()) && (cmSettings.profileName() != cmSettings.doc()->CMSSettings.DefaultImageRGBProfile))
-				{
-					imgInfo.profileName = cmSettings.profileName();
-					profilePath = ScCore->InputProfiles[imgInfo.profileName].toLocal8Bit();
-					inputProfisEmbedded = true;
-					inputProf = ScColorMgmtEngine::openProfileFromFile(profilePath);
-				}
-				else
-				{
-					inputProf = cmSettings.doc()->DocInputImageRGBProf;
-					imgInfo.profileName = cmSettings.doc()->CMSSettings.DefaultImageRGBProfile;
-					inputProfisEmbedded = false;
-				}
+				inputProf = cmSettings.doc()->DocInputImageRGBProf;
+				imgInfo.profileName = cmSettings.doc()->CMSSettings.DefaultImageRGBProfile;
+				inputProfisEmbedded = false;
 			}
 		}
 	}