commit 02ecf8478a64c466cb2b70cf3ccde09ff895c58c
author John Hoford <hoford@google.com> Tue Apr 02 23:44:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 02 23:44:40 2013 +0000
tree 0bcb0768250ea722f01401c7dd9b9ba231124766
parent 7a02a7916312cc25e03badd30a76b36c92a007bc
parent 33acee47cf7e6e107321fdbe4b78554ed2dd6728

Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce

src/com/android/gallery3d/filtershow/cache/CachingPipeline.java

diff --git a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
index 8c312a9..4279b47 100644
--- a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
@@ -393,7 +393,9 @@
                     mOutPixelsAllocation.getType());
             needsUpdate = true;
         }
-        mInPixelsAllocation.copyFrom(bitmap);
+        if (RS != null) {
+            mInPixelsAllocation.copyFrom(bitmap);
+        }
         if (bitmap.getWidth() != mWidth
                 || bitmap.getHeight() != mHeight) {
             mWidth = bitmap.getWidth();