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 | 2b24604837aa9821d7e5ed409c2164ede803e0c4 (patch) | |
| tree | 3d31d6ce54139c568c4821bae97e3abc339dcb09 /src | |
| parent | 0e018f44d4ecccd9be27bd4eac04957741ae57d2 (diff) | |
| parent | 205a0901d5b070e8740e865079bd868c976c67c3 (diff) | |
| download | android_packages_apps_Gallery2-2b24604837aa9821d7e5ed409c2164ede803e0c4.tar.gz android_packages_apps_Gallery2-2b24604837aa9821d7e5ed409c2164ede803e0c4.tar.bz2 android_packages_apps_Gallery2-2b24604837aa9821d7e5ed409c2164ede803e0c4.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(); |