Author: jghali
Date: Sun Jan 20 15:30:49 2019
New Revision: 22810
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22810
Log:
New default ICC profile for CMYK colors: provide better output quality and has
a license which should allow it to be included by Debian
Added:
trunk/Scribus/resources/profiles/ISOcoated_v2_300_bas.icc (with props)
trunk/Scribus/resources/profiles/ISOcoated_v2_300_bas.txt
Modified:
trunk/Scribus/resources/profiles/CMakeLists.txt
trunk/Scribus/resources/profiles/install.targets
trunk/Scribus/scribus/scribuscore.cpp
Modified: trunk/Scribus/resources/profiles/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22810&path=/trunk/Scribus/resources/profiles/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/profiles/CMakeLists.txt (original)
+++ trunk/Scribus/resources/profiles/CMakeLists.txt Sun Jan 20 15:30:49 2019
@@ -5,6 +5,8 @@
install(FILES
GenericCMYK.icm
GenericCMYK.txt
+ISOcoated_v2_300_bas.icc
+ISOcoated_v2_300_bas.txt
Readme
sRGB.icm
srgb.license
Modified: trunk/Scribus/resources/profiles/install.targets
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22810&path=/trunk/Scribus/resources/profiles/install.targets
==============================================================================
--- trunk/Scribus/resources/profiles/install.targets (original)
+++ trunk/Scribus/resources/profiles/install.targets Sun Jan 20 15:30:49 2019
@@ -19,6 +19,16 @@
SkipUnchangedFiles="true"
/>
<Copy
+
SourceFiles="$(MSBuildThisFileDirectory)ISOcoated_v2_300_bas.icc"
+ DestinationFolder="$(OutDir)\share\profiles"
+ SkipUnchangedFiles="true"
+ />
+ <Copy
+
SourceFiles="$(MSBuildThisFileDirectory)ISOcoated_v2_300_bas.txt"
+ DestinationFolder="$(OutDir)\share\profiles"
+ SkipUnchangedFiles="true"
+ />
+ <Copy
SourceFiles="$(MSBuildThisFileDirectory)Readme"
DestinationFolder="$(OutDir)\share\profiles"
SkipUnchangedFiles="true"
Modified: trunk/Scribus/scribus/scribuscore.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22810&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Sun Jan 20 15:30:49 2019
@@ -413,8 +413,9 @@
void ScribusCore::InitDefaultColorTransforms()
{
- QString defaultRGBString = "sRGB IEC61966-2.1";
- QString defaultCMYKString = "Fogra27L CMYK Coated Press";
+ QString defaultRGBString = "sRGB IEC61966-2.1";
+ QString defaultCMYKString1 = "ISO Coated v2 300% (basICColor)";
+ QString defaultCMYKString2 = "Fogra27L CMYK Coated Press";
// Ouvre le profile RGB par d�fault
if (InputProfiles.contains(defaultRGBString))
@@ -423,10 +424,10 @@
defaultRGBProfile = defaultEngine.createProfile_sRGB();
// Ouvre le profile CMYK par d�faut
- if (InputProfilesCMYK.contains(defaultCMYKString))
- {
- defaultCMYKProfile =
defaultEngine.openProfileFromFile(InputProfilesCMYK[defaultCMYKString]);
- }
+ if (InputProfilesCMYK.contains(defaultCMYKString1))
+ defaultCMYKProfile =
defaultEngine.openProfileFromFile(InputProfilesCMYK[defaultCMYKString1]);
+ else if (InputProfilesCMYK.contains(defaultCMYKString2))
+ defaultCMYKProfile =
defaultEngine.openProfileFromFile(InputProfilesCMYK[defaultCMYKString2]);
// Keep all chance to have monitor profile set
monitorProfile = defaultRGBProfile;
@@ -506,7 +507,9 @@
}
if
((m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile.isEmpty())
||
(!InputProfilesCMYK.contains(m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile)))
{
- ip = InputProfilesCMYK.find("Fogra27L CMYK Coated
Press");
+ ip = InputProfilesCMYK.find("ISO Coated v2 300%
(basICColor)");
+ if (ip == InputProfilesCMYK.end())
+ ip = InputProfilesCMYK.find("Fogra27L CMYK
Coated Press");
if (ip == InputProfilesCMYK.end())
ip = InputProfilesCMYK.begin();
m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile = ip.key();
@@ -520,7 +523,9 @@
}
if
((m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile.isEmpty())
||
(!InputProfilesCMYK.contains(m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile)))
{
- ip = InputProfilesCMYK.find("Fogra27L CMYK Coated
Press");
+ ip = InputProfilesCMYK.find("ISO Coated v2 300%
(basICColor)");
+ if (ip == InputProfilesCMYK.end())
+ ip = InputProfilesCMYK.find("Fogra27L CMYK
Coated Press");
if (ip == InputProfilesCMYK.end())
ip = InputProfilesCMYK.begin();
m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile =
ip.key();
@@ -534,7 +539,9 @@
}
if
((m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile.isEmpty())
||
(!PrinterProfiles.contains(m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile)))
{
- ip = PrinterProfiles.find("Fogra27L CMYK Coated Press");
+ ip = PrinterProfiles.find("ISO Coated v2 300%
(basICColor)");
+ if (ip == PrinterProfiles.end())
+ ip = PrinterProfiles.find("Fogra27L CMYK Coated
Press");
if (ip == PrinterProfiles.end())
ip = PrinterProfiles.begin();
m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile = ip.key();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
