From: Leon Scroggins III <scroggo@google.com>
Date: Wed, 9 Jul 2014 18:54:31 +0000 (-0400)
Subject: Call setLocalMatrix before setShader. do not merge
X-Git-Tag: android-x86-7.1-r1~64^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a883e90f6e733c8510b0264d2a2faf9da64a2c16;p=android-x86%2Fpackages-apps-Gallery2.git

Call setLocalMatrix before setShader. do not merge

Now that setLocalMatrix does not modify associated Paints, we need
to call it before assigning the Shader to the Paint.

BUG:14315916
Change-Id: I6778a35eff36515e18c53a979dd69d8aecd1401d
(cherry picked from commit ce3b2ee2c6512a0eac9dbd54641a196baa68ba3f)
---

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 7089e6036..2022ffd7e 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -415,8 +415,9 @@ public class ImageShow extends View implements OnGestureListener,
                     float scaleImageY = mImageBounds.height() / (float) image.getHeight();
                     mShaderMatrix.preScale(scaleImageX, scaleImageY);
                     mMaskPaint.reset();
-                    mMaskPaint.setShader(createShader(image));
-                    mMaskPaint.getShader().setLocalMatrix(mShaderMatrix);
+                    Shader maskShader = createShader(image);
+                    maskShader.setLocalMatrix(mShaderMatrix);
+                    mMaskPaint.setShader(maskShader);
 
                     drawShadow(canvas, mImageBounds); // as needed
                     canvas.drawBitmap(previousImage, m, mPaint);