Commit d006ac56 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/poppler-0.24'

parents d391af7e ed3585ef
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com> // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
// Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com> // Copyright (C) 2011-2013 William Bader <williambader@hotmail.com>
// Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de> // Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de>
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Matthias Kramm <kramm@quiss.org> // Copyright (C) 2012 Matthias Kramm <kramm@quiss.org>
...@@ -518,12 +518,15 @@ void Splash::pipeRun(SplashPipe *pipe) { ...@@ -518,12 +518,15 @@ void Splash::pipeRun(SplashPipe *pipe) {
switch (bitmap->mode) { switch (bitmap->mode) {
#if SPLASH_CMYK #if SPLASH_CMYK
case splashModeDeviceN8: case splashModeDeviceN8:
for (cp = 4; cp < SPOT_NCOMPS + 4; cp++) for (cp = 0; cp < SPOT_NCOMPS + 4; cp++)
cSrcNonIso[cp] = clip255(pipe->cSrc[cp] + cSrcNonIso[cp] = clip255(pipe->cSrc[cp] +
((pipe->cSrc[cp] - cDest[cp]) * t) / 255); ((pipe->cSrc[cp] - cDest[cp]) * t) / 255);
break;
case splashModeCMYK8: case splashModeCMYK8:
cSrcNonIso[3] = clip255(pipe->cSrc[3] + for (cp = 0; cp < 4; cp++)
((pipe->cSrc[3] - cDest[3]) * t) / 255); cSrcNonIso[cp] = clip255(pipe->cSrc[cp] +
((pipe->cSrc[cp] - cDest[cp]) * t) / 255);
break;
#endif #endif
case splashModeXBGR8: case splashModeXBGR8:
cSrcNonIso[3] = 255; cSrcNonIso[3] = 255;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment