summaryrefslogtreecommitdiff
path: root/splash
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2013-02-19 22:26:37 +0100
committerAlbert Astals Cid <aacid@kde.org>2013-02-19 22:26:37 +0100
commit7eb7880907cb7b6bd1032013d6ce4c49aa3525c4 (patch)
treebc248f1d0c5cfd98b1833890b27b0c9926c9ff48 /splash
parent2c84acbfd02eeeaf0d20542798e907cb011c1e57 (diff)
parent1389aa41b2984de9da7bb66c11485f6c6aeaea41 (diff)
Merge remote-tracking branch 'origin/poppler-0.22'
Diffstat (limited to 'splash')
-rw-r--r--splash/Splash.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/splash/Splash.cc b/splash/Splash.cc
index ce2befb5..6617de2d 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -5110,7 +5110,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);
}
}
@@ -5128,7 +5128,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);