r15163 by jghali - restore default color management functionality

[scribus-commit]

Revision: 15163
Author: jghali
Date: 2010-06-05T14:07:05.995468Z
Commit message: restore default color management functionality

Changeset: 
M  /trunk/Scribus/scribus/scimage.cpp

Diffs:
Index: scribus/scimage.cpp
===================================================================
--- scribus/scimage.cpp	(revision 15162)
+++ scribus/scimage.cpp	(revision 15163)
@@ -2193,15 +2193,15 @@
 		inputProf = cmSettings.doc()->colorEngine.openProfileFromMem(embeddedProfile);
 		inputProfIsEmbedded = true;
 	}
-	else if (cmSettings.useColorManagement() && isCMYK)
+	else if (cmSettings.colorManagementAllowed() && isCMYK)
 		inputProf = ScCore->defaultCMYKProfile;
-	else if (cmSettings.useColorManagement() && bilevel && (reqType == CMYKData))
+	else if (cmSettings.colorManagementAllowed() && bilevel && (reqType == CMYKData))
 		inputProf = NULL; // Workaround to map directly gray to K channel
-	else if (cmSettings.useColorManagement())
+	else if (cmSettings.colorManagementAllowed())
 		inputProf = ScCore->defaultRGBProfile;
 	ScColorProfile screenProf  = cmSettings.monitorProfile() ? cmSettings.monitorProfile() : ScCore->defaultRGBProfile;
 	ScColorProfile printerProf = cmSettings.printerProfile() ? cmSettings.printerProfile() : ScCore->defaultCMYKProfile;
-	if (cmSettings.useColorManagement() && inputProf && screenProf && printerProf)
+	if (cmSettings.colorManagementAllowed() && inputProf && screenProf && printerProf)
 	{
 		ScColorMgmtEngine engine(cmSettings.doc() ? cmSettings.doc()->colorEngine : ScCore->defaultEngine);
 		eColorFormat inputProfFormat  = pDataLoader->pixelFormat();