[poppler] 2 commits - splash/Splash.cc

[Albert Astals Cid]

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

New commits:
commit 7eb7880907cb7b6bd1032013d6ce4c49aa3525c4
Merge: 2c84acb 1389aa4
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Feb 19 22:26:37 2013 +0100

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

commit 1389aa41b2984de9da7bb66c11485f6c6aeaea41
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Feb 19 22:25:56 2013 +0100

    fix indent

diff --git a/splash/Splash.cc b/splash/Splash.cc
index d0d986e..5e8090d 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -5087,7 +5087,7 @@ SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc,
 	  alpha = *ap++;
 	  // this uses shape instead of alpha, which isn't technically
 	  // correct, but works out the same
-    pipe.shape = alpha;
+	  pipe.shape = alpha;
 	  (this->*pipe.run)(&pipe);
 	}
       }
@@ -5105,7 +5105,7 @@ SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc,
 	  if (state->clip->test(xDest + x, yDest + y)) {
 	    // this uses shape instead of alpha, which isn't technically
 	    // correct, but works out the same
-      pipe.shape = alpha;
+	    pipe.shape = alpha;
 	    (this->*pipe.run)(&pipe);
 	    updateModX(xDest + x);
 	    updateModY(yDest + y);