[poppler] 2 commits - splash/Splash.cc

[Albert Astals Cid]

 splash/Splash.cc |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c86062f982d6eb08cb27b654b6317c71ab77c692
Merge: 677e5b2 4e142b6
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Mar 4 20:13:36 2013 +0100

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

commit 4e142b60790638e4495b4fd6551702470cf4c38f
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Mar 4 20:12:01 2013 +0100

    Make sure we don't try to paint in x < 0
    
    Fixes crash in KDE bug #315432

diff --git a/splash/Splash.cc b/splash/Splash.cc
index 3d80c4c..cd0ec72 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -3927,6 +3927,8 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData
       xa = imgCoordMungeLower(section[i].xa0 +
 			      ((SplashCoord)y + 0.5 - section[i].ya0) *
 			        section[i].dxdya);
+      if (unlikely(xa < 0))
+        xa = 0;
       xb = imgCoordMungeUpper(section[i].xb0 +
 			      ((SplashCoord)y + 0.5 - section[i].yb0) *
 			        section[i].dxdyb);