summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-04-02 15:55:55 -0700
committerJohn Hoford <hoford@google.com>2013-04-02 16:01:43 -0700
commit33acee47cf7e6e107321fdbe4b78554ed2dd6728 (patch)
tree448755f8ef3ef689baa2fd5fad62ee7d544a0e7c /src
parentf16b61831d53b1319f6543e1df616805b34b5279 (diff)
downloadandroid_packages_apps_Snap-33acee47cf7e6e107321fdbe4b78554ed2dd6728.tar.gz
android_packages_apps_Snap-33acee47cf7e6e107321fdbe4b78554ed2dd6728.tar.bz2
android_packages_apps_Snap-33acee47cf7e6e107321fdbe4b78554ed2dd6728.zip
fix calling Allocation.copyFrom without context
bug:8526929 Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/cache/CachingPipeline.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
index 8c312a92b..4279b47fb 100644
--- a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
@@ -393,7 +393,9 @@ public class CachingPipeline {
mOutPixelsAllocation.getType());
needsUpdate = true;
}
- mInPixelsAllocation.copyFrom(bitmap);
+ if (RS != null) {
+ mInPixelsAllocation.copyFrom(bitmap);
+ }
if (bitmap.getWidth() != mWidth
|| bitmap.getHeight() != mHeight) {
mWidth = bitmap.getWidth();