splash/Splash.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 0d42a6dab479d27de1ecb2b47ad3f7568b1ee638 Merge: 7eb7880 8fb243b Author: Albert Astals Cid <[email protected]> Date: Wed Feb 20 00:00:09 2013 +0100 Merge remote-tracking branch 'origin/poppler-0.22' commit 8fb243bf11a979af8bfa36427436940706c9f71d Author: Albert Astals Cid <[email protected]> Date: Tue Feb 19 23:59:17 2013 +0100 Initialize cSrcNonIso[3] in splashModeXBGR8 Fixes valgrind warning diff --git a/splash/Splash.cc b/splash/Splash.cc index b9fa11a..3d80c4c 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -525,8 +525,9 @@ void Splash::pipeRun(SplashPipe *pipe) { cSrcNonIso[3] = clip255(pipe->cSrc[3] + ((pipe->cSrc[3] - cDest[3]) * t) / 255); #endif - case splashModeRGB8: case splashModeXBGR8: + cSrcNonIso[3] = 255; + case splashModeRGB8: case splashModeBGR8: cSrcNonIso[2] = clip255(pipe->cSrc[2] + ((pipe->cSrc[2] - cDest[2]) * t) / 255); commit 8a0199a0247c1a03a4d64375ca8bc900570d1817 Author: Albert Astals Cid <[email protected]> Date: Tue Feb 19 23:11:46 2013 +0100 Fix indent diff --git a/splash/Splash.cc b/splash/Splash.cc index 5e8090d..b9fa11a 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -526,7 +526,7 @@ void Splash::pipeRun(SplashPipe *pipe) { ((pipe->cSrc[3] - cDest[3]) * t) / 255); #endif case splashModeRGB8: - case splashModeXBGR8: + case splashModeXBGR8: case splashModeBGR8: cSrcNonIso[2] = clip255(pipe->cSrc[2] + ((pipe->cSrc[2] - cDest[2]) * t) / 255); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
