From 2a9a6b53fb4a07b27773ee31171f441bc8aa08b3 Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 16 Oct 2012 17:06:13 -0700 Subject: Add hook to manipulate SurfaceTexture transform Bug: 7302956 Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28 --- gallerycommon/src/com/android/gallery3d/common/Utils.java | 2 +- src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gallerycommon/src/com/android/gallery3d/common/Utils.java b/gallerycommon/src/com/android/gallery3d/common/Utils.java index f5a266706..3a68745c4 100644 --- a/gallerycommon/src/com/android/gallery3d/common/Utils.java +++ b/gallerycommon/src/com/android/gallery3d/common/Utils.java @@ -76,7 +76,7 @@ public class Utils { // Throws IllegalArgumentException if the input is <= 0 or // the answer overflows. public static int nextPowerOf2(int n) { - if (n <= 0 || n > (1 << 30)) throw new IllegalArgumentException(); + if (n <= 0 || n > (1 << 30)) throw new IllegalArgumentException("n is invalid: " + n); n -= 1; n |= n >> 16; n |= n >> 8; diff --git a/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java b/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java index 1930e3877..7cb894845 100644 --- a/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java +++ b/src/com/android/gallery3d/ui/SurfaceTextureScreenNail.java @@ -109,6 +109,7 @@ public abstract class SurfaceTextureScreenNail implements ScreenNail, canvas.translate(cx, cy); canvas.scale(1, -1, 1); canvas.translate(-cx, -cy); + updateTransformMatrix(mTransform); canvas.drawTexture(mExtTexture, mTransform, x, y, width, height); canvas.restore(); } @@ -119,6 +120,8 @@ public abstract class SurfaceTextureScreenNail implements ScreenNail, throw new UnsupportedOperationException(); } + protected void updateTransformMatrix(float[] matrix) {} + @Override abstract public void noDraw(); -- cgit v1.2.3