Attachment 99510 Details for Bug 79019 – use alt colorspace to get CMYK values for an ICC based CMYK colorspace

[patch] use alt colorspace to get CMYK values for an ICC based CMYK colorspace

79019.patch (text/plain), 1.60 KB, created by Thomas Freitag on 2014-05-21 14:19:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2014-05-21 14:19:27 UTC

Size: 1.60 KB

patch

obsolete

>diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
>index eb11777..e7431bd 100644
>--- a/poppler/GfxState.cc
>+++ b/poppler/GfxState.cc
>@@ -2189,7 +2189,7 @@ void GfxICCBasedColorSpace::getCMYKLine(Guchar *in, Guchar *out, int length) {
> #ifdef USE_CMS
>   if (lineTransform != NULL && lineTransform->getTransformPixelType() == PT_CMYK) {
>     transform->doTransform(in,out,length);
>-  } else if (lineTransform != NULL) {
>+  } else if (lineTransform != NULL && nComps != 4) {
>     GfxColorComp c, m, y, k;
>     Guchar* tmp = (Guchar *)gmallocn(3 * length, sizeof(Guchar));
>     getRGBLine(in, tmp, length);
>@@ -2232,7 +2232,7 @@ void GfxICCBasedColorSpace::getDeviceNLine(Guchar *in, Guchar *out, int length)
>         *out++ = 0;
>     }
>     gfree(tmp);
>-  } else if (lineTransform != NULL) {
>+  } else if (lineTransform != NULL && nComps != 4) {
>     GfxColorComp c, m, y, k;
>     Guchar* tmp = (Guchar *)gmallocn(3 * length, sizeof(Guchar));
>     getRGBLine(in, tmp, length);
>@@ -2302,7 +2302,7 @@ void GfxICCBasedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
>       unsigned int value = (out[0] << 24) + (out[1] << 16) + (out[2] << 8) + out[3];
>       cmsCache.insert(std::pair<unsigned int, unsigned int>(key, value));
>     }
>-  } else {
>+  } else if (nComps != 4 && transform != NULL && transform->getTransformPixelType() == PT_RGB) {
>     GfxRGB rgb;
>     GfxColorComp c, m, y, k;
> 
>@@ -2321,6 +2321,8 @@ void GfxICCBasedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
>     cmyk->m = m - k;
>     cmyk->y = y - k;
>     cmyk->k = k;
>+  } else {
>+    alt->getCMYK(color, cmyk);
>   }
> #else
>   alt->getCMYK(color, cmyk);

Actions: View | Splinter Review

Attachments on bug 79019: 99508 | 99510

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.