diff options
| author | Albert Astals Cid <aacid@kde.org> | 2015-02-25 21:51:34 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2015-02-25 21:51:34 +0100 |
| commit | b7fde1ec83a5fff9bec73becc22e581583a30d43 (patch) | |
| tree | ee111341ebecff0e9f8d66e1c268bef79b8fd0cc | |
| parent | 7980fe868a8ef2ee3315f0bcb606c448d6604039 (diff) | |
Fix last commit regression
It seems it actually needs to be pipe->shape and not pipe->usesShape (i.e. it seems at some point we use pipe->shape with useShape being false)
Otherwise we had a regression on eci_altona-test-suite-v2_technical2_x4.pdf
| -rw-r--r-- | splash/Splash.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/splash/Splash.cc b/splash/Splash.cc index cac226db..d8ee6409 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -271,6 +271,7 @@ inline void Splash::pipeInit(SplashPipe *pipe, int x, int y, // source alpha pipe->aInput = aInput; pipe->usesShape = usesShape; + pipe->shape = 0; // knockout pipe->knockout = knockout; @@ -467,7 +468,7 @@ void Splash::pipeRun(SplashPipe *pipe) { //----- read destination pixel Guchar *destColorPtr; - if (pipe->usesShape && state->blendFunc && pipe->knockout && alpha0Bitmap != NULL) { + if (pipe->shape && state->blendFunc && pipe->knockout && alpha0Bitmap != NULL) { destColorPtr = alpha0Bitmap->data + (alpha0Y+pipe->y)*alpha0Bitmap->rowSize; switch (bitmap->mode) { case splashModeMono1: |