diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-04-17 08:37:22 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-04-17 08:42:42 -0700 |
| commit | e7abc9ca7565ba123032784e9b14d2d6d1590393 (patch) | |
| tree | f8f92358a60721225671ca49cad733dbc27ee2eb /src/com/android/gallery3d/filtershow/cache | |
| parent | a40200389cc61d6164dcbce0299dbcb77b810c66 (diff) | |
| download | android_packages_apps_Snap-e7abc9ca7565ba123032784e9b14d2d6d1590393.tar.gz android_packages_apps_Snap-e7abc9ca7565ba123032784e9b14d2d6d1590393.tar.bz2 android_packages_apps_Snap-e7abc9ca7565ba123032784e9b14d2d6d1590393.zip | |
Fix border apply if no filter applied
Change-Id: Ic5b319625b42adb298094c4ad202d6c161538644
Diffstat (limited to 'src/com/android/gallery3d/filtershow/cache')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/CachingPipeline.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java index 8cb8f8f9e..fb0a29ebd 100644 --- a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java @@ -308,8 +308,11 @@ public class CachingPipeline { setupEnvironment(preset, false); mFiltersManager.freeFilterResources(preset); preset.applyFilters(-1, -1, in, out, mEnvironment); - // TODO: we should render the border onto a different bitmap instead - preset.applyBorder(in, out, mEnvironment); + boolean copyOut = false; + if (preset.nbFilters() > 0) { + copyOut = true; + } + preset.applyBorder(in, out, copyOut, mEnvironment); } } |