View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0004149 | Scribus | General | public | 2006-08-20 15:11 | 2006-08-21 21:11 |
| Reporter | TomK32 | Assigned To | jghali | ||
| Priority | normal | Severity | block | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Platform | MacOSX | OS | MacOSX | OS Version | 10.4 Tiger |
| Product Version | 1.3.3.4cvs | ||||
| Fixed in Version | 1.3.4cvs | ||||
| Summary | 0004149: compile error w/o cms | ||||
| Description | to keep it simple, the patch (compiler complained while compiling cmsettings.cpp) that worked for me. TomK32:~/Arbeit/scribus/Scribus/scribus tomk32$ cvs diff -u cmsettings.cpp Index: cmsettings.cpp =================================================================== RCS file: /cvs/Scribus/scribus/Attic/cmsettings.cpp,v retrieving revision 1.1.2.7 diff -u -r1.1.2.7 cmsettings.cpp --- cmsettings.cpp 6 Aug 2006 17:24:25 -0000 1.1.2.7 +++ cmsettings.cpp 20 Aug 2006 15:12:31 -0000 @@ -87,19 +87,6 @@ return QString(); } -int CMSettings::colorRenderingIntent() const -{ - if (m_Doc) - return m_Doc->IntentColors; - return -1; -} - -int CMSettings::imageRenderingIntent() const -{ - if (m_Doc) - return m_Doc->IntentImages; - return -1; -} bool CMSettings::useBlackPoint() const { @@ -123,6 +110,20 @@ } #ifdef HAVE_CMS +int CMSettings::colorRenderingIntent() const +{ + if (m_Doc) + return m_Doc->IntentColors; + return -1; +} + +int CMSettings::imageRenderingIntent() const +{ + if (m_Doc) + return m_Doc->IntentImages; + return -1; +} + cmsHPROFILE CMSettings::monitorProfile() const { if (m_Doc->HasCMS) | ||||
| Tags | No tags attached. | ||||
| Patch | |||||
| child of | 0003964 | closed | 1.3.4 Release Metabug |
|
|
another one, in sccolor.cpp. But I'm really not sure if this patch is logically correct. Compiles at least TomK32:/Volumes/Daten/Arbeit/scribus/Scribus/scribus tomk32$ cvs diff -u sccolor.cpp Index: sccolor.cpp =================================================================== RCS file: /cvs/Scribus/scribus/Attic/sccolor.cpp,v retrieving revision 1.1.2.15 diff -u -r1.1.2.15 sccolor.cpp --- sccolor.cpp 11 Jul 2006 21:07:27 -0000 1.1.2.15 +++ sccolor.cpp 20 Aug 2006 15:27:27 -0000 @@ -255,6 +255,7 @@ QColor ScColor::getDisplayColorGC() { QColor tmp; +#if defined HAVE_CMS bool doSoftProofing = m_doc ? m_doc->SoftProofing : false; bool doGamutCheck = m_doc ? m_doc->Gamut : false; if( doSoftProofing && doGamutCheck ) @@ -262,19 +263,26 @@ checkGamut(); tmp = outOfGamutFlag ? QColor(0, 255, 0) : getDisplayColor(); } - else - tmp = getDisplayColor(); + else tmp = getDisplayColor(); +#else + tmp = getDisplayColor(); +#endif + return tmp; } QColor ScColor::getColorProof(bool gamutCheck) const { QColor tmp; +#if defined HAVE_CMS bool gamutChkEnabled = m_doc ? m_doc->Gamut : false; if (Model == colorModelRGB) tmp = getColorProof(R, G, B, gamutCheck & gamutChkEnabled); else tmp = getColorProof(C, M, Y, K, gamutCheck & gamutChkEnabled); +#else + tmp = getColorProof(C, M, Y, K, gamutCheck & false); +#endif return tmp; } |
|
|
fixing this issue for now, but fyi lcms may be a requirement soon |
|
|
*will* |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2006-08-20 15:11 | TomK32 | New Issue | |
| 2006-08-20 15:26 | TomK32 | Note Added: 0012242 | |
| 2006-08-20 20:20 | cbradney | Relationship added | child of 0003964 |
| 2006-08-20 21:56 | jghali | Status | new => resolved |
| 2006-08-20 21:56 | jghali | Fixed in Version | => 1.3.4cvs |
| 2006-08-20 21:56 | jghali | Resolution | open => fixed |
| 2006-08-20 21:56 | jghali | Assigned To | => jghali |
| 2006-08-20 21:56 | jghali | Note Added: 0012248 | |
| 2006-08-20 22:47 | cbradney | Note Added: 0012249 | |
| 2006-08-21 21:10 | cbradney | Status | resolved => closed |
