splash/Splash.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit d006ac567e59e82c4c6cb42c5e429a4aa516ac0b Merge: d391af7 ed3585e Author: Albert Astals Cid <[email protected]> Date: Sun Aug 25 19:36:33 2013 +0200 Merge remote-tracking branch 'origin/poppler-0.24' commit ed3585efc8b259cb065eac361a6a499f9f26851f Author: William Bader <[email protected]> Date: Sun Aug 25 19:31:11 2013 +0200 Fix pdftops -eps -level1sep rendering of a file Since 8fb243bf11a979af8bfa36427436940706c9f71d we have case splashModeXBGR8: + cSrcNonIso[3] = 255; and that means splashModeDeviceN8 and splashModeCMYK8 can't skip their breaks anymore otherwise the cSrcNonIso[3] gets overwritten Bug #68321 diff --git a/splash/Splash.cc b/splash/Splash.cc index d5aec8f..6bb0dfe 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -15,7 +15,7 @@ // Copyright (C) 2005 Marco Pesenti Gritti <[email protected]> // Copyright (C) 2010-2013 Thomas Freitag <[email protected]> // Copyright (C) 2010 Christian Feuersänger <[email protected]> -// Copyright (C) 2011, 2012 William Bader <[email protected]> +// Copyright (C) 2011-2013 William Bader <[email protected]> // Copyright (C) 2012 Markus Trippelsdorf <[email protected]> // Copyright (C) 2012 Adrian Johnson <[email protected]> // Copyright (C) 2012 Matthias Kramm <[email protected]> @@ -518,12 +518,15 @@ void Splash::pipeRun(SplashPipe *pipe) { switch (bitmap->mode) { #if SPLASH_CMYK case splashModeDeviceN8: - for (cp = 4; cp < SPOT_NCOMPS + 4; cp++) + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) cSrcNonIso[cp] = clip255(pipe->cSrc[cp] + ((pipe->cSrc[cp] - cDest[cp]) * t) / 255); + break; case splashModeCMYK8: - cSrcNonIso[3] = clip255(pipe->cSrc[3] + - ((pipe->cSrc[3] - cDest[3]) * t) / 255); + for (cp = 0; cp < 4; cp++) + cSrcNonIso[cp] = clip255(pipe->cSrc[cp] + + ((pipe->cSrc[cp] - cDest[cp]) * t) / 255); + break; #endif case splashModeXBGR8: cSrcNonIso[3] = 255;
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
