diff options
author | Albert Astals Cid <aacid@kde.org> | 2013-08-25 19:36:33 +0200 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2013-08-25 19:36:33 +0200 |
commit | d006ac567e59e82c4c6cb42c5e429a4aa516ac0b (patch) | |
tree | ce2ffa60dbca318dbaa8fec703bafe81adb5cda7 | |
parent | d391af7ea63c4bc884bb81895aea0cdd8f8b282a (diff) | |
parent | ed3585efc8b259cb065eac361a6a499f9f26851f (diff) |
Merge remote-tracking branch 'origin/poppler-0.24'
-rw-r--r-- | splash/Splash.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/splash/Splash.cc b/splash/Splash.cc index d5aec8f9..6bb0dfe5 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -15,7 +15,7 @@ // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> // Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de> // 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 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2012 Matthias Kramm <kramm@quiss.org> @@ -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; |