diff options
author | Leon Scroggins III <scroggo@google.com> | 2014-07-09 14:54:31 -0400 |
---|---|---|
committer | Leon Scroggins <scroggo@google.com> | 2014-07-15 13:57:27 +0000 |
commit | a883e90f6e733c8510b0264d2a2faf9da64a2c16 (patch) | |
tree | d0442d8319917b395935e7117afcbeefdeb8c44e /src/com/android/gallery3d | |
parent | 7f61cdf0066d963d1b076a2800147fd9c093f1a6 (diff) | |
download | android_packages_apps_Gallery2-a883e90f6e733c8510b0264d2a2faf9da64a2c16.tar.gz android_packages_apps_Gallery2-a883e90f6e733c8510b0264d2a2faf9da64a2c16.tar.bz2 android_packages_apps_Gallery2-a883e90f6e733c8510b0264d2a2faf9da64a2c16.zip |
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)
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageShow.java | 5 |
1 files changed, 3 insertions, 2 deletions
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); |