diff options
| author | John Hoford <hoford@google.com> | 2013-04-02 23:44:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-02 23:44:40 +0000 |
| commit | 02ecf8478a64c466cb2b70cf3ccde09ff895c58c (patch) | |
| tree | 0bcb0768250ea722f01401c7dd9b9ba231124766 /src | |
| parent | 7a02a7916312cc25e03badd30a76b36c92a007bc (diff) | |
| parent | 33acee47cf7e6e107321fdbe4b78554ed2dd6728 (diff) | |
| download | android_packages_apps_Snap-02ecf8478a64c466cb2b70cf3ccde09ff895c58c.tar.gz android_packages_apps_Snap-02ecf8478a64c466cb2b70cf3ccde09ff895c58c.tar.bz2 android_packages_apps_Snap-02ecf8478a64c466cb2b70cf3ccde09ff895c58c.zip | |
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/CachingPipeline.java | 4 |
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(); |