Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 8449 → Rev 8462

/branches/Version133x/Scribus/scribus/reformdoc.cpp
971,6 → 971,7
ScMW->mainWindowProgressBar->setTotalSteps(cc);
#ifdef HAVE_CMS
currDoc->HasCMS = currDoc->CMSSettings.CMSinUse;
currDoc->BlackPoint = currDoc->CMSSettings.BlackPoint;
currDoc->SoftProofing = currDoc->CMSSettings.SoftProofOn;
currDoc->Gamut = currDoc->CMSSettings.GamutCheck;
currDoc->IntentPrinter = currDoc->CMSSettings.DefaultIntentPrinter;
/branches/Version133x/Scribus/scribus/scribusdoc.cpp
363,6 → 363,7
PDF_Options.Intent = CMSSettings.DefaultIntentMonitor;
PDF_Options.Intent2 = CMSSettings.DefaultIntentImages;
#ifdef HAVE_CMS
BlackPoint = CMSSettings.BlackPoint;
SoftProofing = CMSSettings.SoftProofOn;
Gamut = CMSSettings.GamutCheck;
IntentPrinter = CMSSettings.DefaultIntentPrinter;
/branches/Version133x/Scribus/scribus/scribusdoc.h
726,6 → 726,7
cmsHTRANSFORM stdProofCMYKGC;
cmsHTRANSFORM stdTransImg;
cmsHTRANSFORM stdProofImg;
bool BlackPoint;
bool SoftProofing;
bool Gamut;
int IntentMonitor;
/branches/Version133x/Scribus/scribus/scimage.cpp
3491,6 → 3491,7
cmsHPROFILE inputProf = 0;
cmsHPROFILE tiffProf = 0;
int cmsFlags = 0;
int cmsProofFlags = 0;
#endif
QFileInfo fi = QFileInfo(fn);
if (!fi.exists())
4331,9 → 4332,9
prnProfFormat = SC_TYPE_YMCK_8;
if (SoftProofing)
{
cmsFlags |= cmsFLAGS_SOFTPROOFING;
cmsProofFlags |= cmsFLAGS_SOFTPROOFING;
if (Gamut)
cmsFlags |= cmsFLAGS_GAMUTCHECK;
cmsProofFlags |= cmsFLAGS_GAMUTCHECK;
}
if (BlackPoint)
cmsFlags |= cmsFLAGS_BLACKPOINTCOMPENSATION;
4343,13 → 4344,13
{
case 0: // CMYK
if (!isCMYK)
xform = scCmsCreateTransform(inputProf, inputProfFormat, CMSprinterProf, prnProfFormat, IntentPrinter, 0);
xform = scCmsCreateTransform(inputProf, inputProfFormat, CMSprinterProf, prnProfFormat, IntentPrinter, cmsFlags);
break;
case 1: // RGB
if (isCMYK) {
if (systemBigEndian)
swapByteOrder(3, 2, 1, 0);
xform = scCmsCreateTransform(inputProf, inputProfFormat, CMSoutputProf, TYPE_BGRA_8, rend, 0);
xform = scCmsCreateTransform(inputProf, inputProfFormat, CMSoutputProf, TYPE_BGRA_8, rend, cmsFlags);
}
break;
case 2: // RGB Proof
4358,7 → 4359,7
{
xform = scCmsCreateProofingTransform(inputProf, inputProfFormat,
CMSoutputProf, TYPE_BGRA_8, CMSprinterProf,
IntentPrinter, rend, cmsFlags);
IntentPrinter, rend, cmsFlags | cmsProofFlags);
}
else
xform = scCmsCreateTransform(inputProf, inputProfFormat,
/branches/Version133x/Scribus/scribus/scribus.cpp
2188,6 → 2188,7
updateColorMenu();
buildFontMenu();
#ifdef HAVE_CMS
BlackPoint = doc->BlackPoint;
SoftProofing = doc->SoftProofing;
Gamut = doc->Gamut;
IntentPrinter = doc->IntentPrinter;
3292,6 → 3293,7
w->setUpdatesEnabled(false);
view->setUpdatesEnabled(false);
#ifdef HAVE_CMS
doc->BlackPoint = false;
doc->SoftProofing = false;
doc->Gamut = false;
bool cmsu = CMSuse;
3440,11 → 3442,13
QMessageBox::warning(this, CommonStrings::trWarning, mess, 1, 0, 0);
}
#ifdef HAVE_CMS
doc->BlackPoint = doc->CMSSettings.BlackPoint;
doc->SoftProofing = doc->CMSSettings.SoftProofOn;
doc->Gamut = doc->CMSSettings.GamutCheck;
CMSuse = doc->CMSSettings.CMSinUse;
doc->IntentPrinter = doc->CMSSettings.DefaultIntentPrinter;
doc->IntentMonitor = doc->CMSSettings.DefaultIntentMonitor;
BlackPoint = doc->BlackPoint;
SoftProofing = doc->CMSSettings.SoftProofOn;
Gamut = doc->CMSSettings.GamutCheck;
IntentPrinter = doc->CMSSettings.DefaultIntentPrinter;
3998,6 → 4002,7
{
#ifdef HAVE_CMS
CMSuse = false;
BlackPoint = prefsManager->appPrefs.DCMSset.BlackPoint;
SoftProofing = prefsManager->appPrefs.DCMSset.SoftProofOn;
IntentPrinter = prefsManager->appPrefs.DCMSset.DefaultIntentPrinter;
IntentMonitor = prefsManager->appPrefs.DCMSset.DefaultIntentMonitor;
8171,6 → 8176,7
prefsManager->appPrefs.DCMSset.DefaultPrinterProfile = ip.key();
}
#ifdef HAVE_CMS
BlackPoint = prefsManager->appPrefs.DCMSset.BlackPoint;
SoftProofing = prefsManager->appPrefs.DCMSset.SoftProofOn;
CMSuse = false;
IntentPrinter = prefsManager->appPrefs.DCMSset.DefaultIntentPrinter;