diff options
| -rw-r--r-- | poppler/GfxState.cc | 83 | ||||
| -rw-r--r-- | poppler/GfxState.h | 5 |
2 files changed, 42 insertions, 46 deletions
diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc index fb8cb37a..2fb78c1c 100644 --- a/poppler/GfxState.cc +++ b/poppler/GfxState.cc @@ -216,51 +216,10 @@ GfxColorTransform::GfxColorTransform(const GfxLCMSProfilePtr& sourceProfileA, vo cmsIntent = cmsIntentA; inputPixelType = inputPixelTypeA; transformPixelType = transformPixelTypeA; - psCSA = nullptr; } GfxColorTransform::~GfxColorTransform() { cmsDeleteTransform(transform); - if (psCSA) - gfree(psCSA); -} - -char *GfxColorTransform::getPostScriptCSA() -{ -#if LCMS_VERSION>=2070 - // The runtime version check of lcms2 is only available from release 2.7 upwards. - // The generation of the CSA code only works reliably for version 2.10 and upwards. - // Cf. the explanation in the corresponding lcms2 merge request [1], and the original mail thread [2]. - // [1] https://github.com/mm2/Little-CMS/pull/214 - // [2] https://sourceforge.net/p/lcms/mailman/message/33182987/ - if (cmsGetEncodedCMMversion() < 2100) - return nullptr; - - int size; - - if (psCSA) - return psCSA; - - if (!sourceProfile) { - error(errSyntaxWarning, -1, "profile is nullptr"); - return nullptr; - } - - void *rawprofile = sourceProfile.get(); - size = cmsGetPostScriptCSA(cmsGetProfileContextID(rawprofile), rawprofile, cmsIntent, 0, nullptr, 0); - if (size == 0) { - error(errSyntaxWarning, -1, "PostScript CSA is nullptr"); - return nullptr; - } - - psCSA = (char*)gmalloc(size+1); - cmsGetPostScriptCSA(cmsGetProfileContextID(rawprofile), rawprofile, cmsIntent, 0, psCSA, size); - psCSA[size] = 0; - - return psCSA; -#else - return nullptr; -#endif } static GfxLCMSProfilePtr RGBProfile = nullptr; @@ -1758,11 +1717,16 @@ GfxICCBasedColorSpace::GfxICCBasedColorSpace(int nCompsA, GfxColorSpace *altA, #ifdef USE_CMS transform = nullptr; lineTransform = nullptr; + psCSA = nullptr; #endif } GfxICCBasedColorSpace::~GfxICCBasedColorSpace() { delete alt; +#ifdef USE_CMS + if (psCSA) + gfree(psCSA); +#endif } GfxColorSpace *GfxICCBasedColorSpace::copy() const { @@ -1870,6 +1834,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState profBuf = iccStream->toUnsignedChars(&length, 65536, 65536); auto hp = make_GfxLCMSProfilePtr(cmsOpenProfileFromMem(profBuf,length)); + cs->profile = hp; gfree(profBuf); if (!hp) { error(errSyntaxWarning, -1, "read ICCBased color space profile error"); @@ -2366,10 +2331,40 @@ void GfxICCBasedColorSpace::getDefaultRanges(double *decodeLow, #ifdef USE_CMS char *GfxICCBasedColorSpace::getPostScriptCSA() { - if (transform) - return transform->getPostScriptCSA(); - else +#if LCMS_VERSION>=2070 + // The runtime version check of lcms2 is only available from release 2.7 upwards. + // The generation of the CSA code only works reliably for version 2.10 and upwards. + // Cf. the explanation in the corresponding lcms2 merge request [1], and the original mail thread [2]. + // [1] https://github.com/mm2/Little-CMS/pull/214 + // [2] https://sourceforge.net/p/lcms/mailman/message/33182987/ + if (cmsGetEncodedCMMversion() < 2100) return nullptr; + + int size; + + if (psCSA) + return psCSA; + + if (!profile) { + error(errSyntaxWarning, -1, "profile is nullptr"); + return nullptr; + } + + void *rawprofile = profile.get(); + size = cmsGetPostScriptCSA(cmsGetProfileContextID(rawprofile), rawprofile, getIntent(), 0, nullptr, 0); + if (size == 0) { + error(errSyntaxWarning, -1, "PostScript CSA is nullptr"); + return nullptr; + } + + psCSA = (char*)gmalloc(size+1); + cmsGetPostScriptCSA(cmsGetProfileContextID(rawprofile), rawprofile, getIntent(), 0, psCSA, size); + psCSA[size] = 0; + + return psCSA; +#else + return nullptr; +#endif } #endif diff --git a/poppler/GfxState.h b/poppler/GfxState.h index 1a673b20..f79c6bc7 100644 --- a/poppler/GfxState.h +++ b/poppler/GfxState.h @@ -213,7 +213,6 @@ public: int getInputPixelType() const { return inputPixelType; } int getTransformPixelType() const { return transformPixelType; } GfxLCMSProfilePtr getSourceProfile() { return sourceProfile; } - char *getPostScriptCSA(); private: GfxColorTransform() {} GfxLCMSProfilePtr sourceProfile; @@ -221,7 +220,6 @@ private: int cmsIntent; unsigned int inputPixelType; unsigned int transformPixelType; - char *psCSA; }; class GfxColorSpace { @@ -582,6 +580,7 @@ public: Ref getRef() { return iccProfileStream; } #ifdef USE_CMS char *getPostScriptCSA(); + GfxLCMSProfilePtr getProfile() { return profile; } #endif private: @@ -592,6 +591,8 @@ private: double rangeMax[4]; // max values for each component Ref iccProfileStream; // the ICC profile #ifdef USE_CMS + GfxLCMSProfilePtr profile; + char* psCSA; int getIntent() { return (transform != nullptr) ? transform->getIntent() : 0; } std::shared_ptr<GfxColorTransform> transform; std::shared_ptr<GfxColorTransform> lineTransform; // color transform for line |