diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-03-28 03:53:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-28 03:53:46 +0000 |
| commit | 6d2104b2dd31e39e8f3c178375d4d91055a24a54 (patch) | |
| tree | cd8c4614f5bb20da82a7ae91d4e6a08631b911a9 /src | |
| parent | 2a23c46ca52e9af02aac7c454a89d2b9c4f2e539 (diff) | |
| parent | 2f7cb89c74f7d0c01d847bdfe7fbd8c31c2d0fb5 (diff) | |
| download | android_packages_apps_Snap-6d2104b2dd31e39e8f3c178375d4d91055a24a54.tar.gz android_packages_apps_Snap-6d2104b2dd31e39e8f3c178375d4d91055a24a54.tar.bz2 android_packages_apps_Snap-6d2104b2dd31e39e8f3c178375d4d91055a24a54.zip | |
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java index 56e848aa7..cff071142 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java @@ -70,15 +70,12 @@ public abstract class ImageFilterRS extends ImageFilter { if (DEBUG) { Log.v(LOGTAG, "apply filter " + getName() + " in pipeline " + pipeline.getName()); } - boolean needsUpdate = pipeline.prepareRenderscriptAllocations(bitmap); - if (needsUpdate || !isResourcesLoaded()) { - // the allocations changed size - freeResources(); - createFilter(sResources, scaleFactor, quality); - setResourcesLoaded(true); - } + pipeline.prepareRenderscriptAllocations(bitmap); + createFilter(sResources, scaleFactor, quality); + setResourcesLoaded(true); runFilter(); update(bitmap); + freeResources(); if (DEBUG) { Log.v(LOGTAG, "DONE apply filter " + getName() + " in pipeline " + pipeline.getName()); } |