Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 4006 → Rev 4007

/branches/Version13x/Scribus/scribus/about.cpp
46,8 → 46,8
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString BUILD_DAY = "24";
QString BUILD_MONTH = tr("November");
QString BUILD_DAY = "03";
QString BUILD_MONTH = tr("December");
QString BUILD_YEAR = "2005";
QString BUILD_TIME = "";
QString BUILD_TZ = "";
/branches/Version13x/Scribus/scribus/pdflib.cpp
48,6 → 48,7
#include "prefsmanager.h"
#include "prefscontext.h"
#include "pdfoptions.h"
#include "sccolor.h"
 
using namespace std;
 
2548,19 → 2549,32
#ifdef HAVE_CMS
if ((CMSuse) && (Options->UseProfiles))
{
QString tmp2[] = {"/Perceptual", "/RelativeColorimetric", "/Saturation", "/AbsoluteColorimetric"};
tmp += tmp2[Options->Intent]+ " ri\n";
if (color != "None")
if (tmpC.getColorModel() == colorModelCMYK)
{
if (fill)
if (color != "None")
{
tmp += "/"+ICCProfiles[Options->SolidProf].ResName+" cs\n";
tmp += colString+" scn\n";
if (fill)
tmp += colString+" k\n";
else
tmp += colString+" K\n";
}
else
}
else
{
QString tmp2[] = {"/Perceptual", "/RelativeColorimetric", "/Saturation", "/AbsoluteColorimetric"};
tmp += tmp2[Options->Intent]+ " ri\n";
if (color != "None")
{
tmp += "/"+ICCProfiles[Options->SolidProf].ResName+" CS\n";
tmp += colString+" SCN\n";
if (fill)
{
tmp += "/"+ICCProfiles[Options->SolidProf].ResName+" cs\n";
tmp += colString+" scn\n";
}
else
{
tmp += "/"+ICCProfiles[Options->SolidProf].ResName+" CS\n";
tmp += colString+" SCN\n";
}
}
}
}
3189,15 → 3203,23
#ifdef HAVE_CMS
if ((CMSuse) && (Options->UseProfiles))
{
if (Options->SComp == 3)
if (tmpC.getColorModel() == colorModelCMYK)
{
tmpC.getShadeColorRGB(&h, &s, &v, Shade);
tmp = FToStr(h / 255.0)+" "+FToStr(s / 255.0)+" "+FToStr(v / 255.0);
tmpC.getShadeColorCMYK(&h, &s, &v, &k, Shade);
tmp = FToStr(h / 255.0)+" "+FToStr(s / 255.0)+" "+FToStr(v / 255.0)+" "+FToStr(k / 255.0);
}
else
{
tmpC.getShadeColorCMYK(&h, &s, &v, &k, Shade);
tmp = FToStr(h / 255.0)+" "+FToStr(s / 255.0)+" "+FToStr(v / 255.0)+" "+FToStr(k / 255.0);
if (Options->SComp == 3)
{
tmpC.getShadeColorRGB(&h, &s, &v, Shade);
tmp = FToStr(h / 255.0)+" "+FToStr(s / 255.0)+" "+FToStr(v / 255.0);
}
else
{
tmpC.getShadeColorCMYK(&h, &s, &v, &k, Shade);
tmp = FToStr(h / 255.0)+" "+FToStr(s / 255.0)+" "+FToStr(v / 255.0)+" "+FToStr(k / 255.0);
}
}
}
else