diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-09 16:34:58 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2012-10-09 17:39:36 -0700 |
| commit | ce41d9869c7f4d747ccc85a6a2e8f285be0197c2 (patch) | |
| tree | d85b6453d8afd3c819c2a318ae6acc2139ea5b54 /src/com/android/gallery3d/filtershow/presets/ImagePreset.java | |
| parent | 9ea20852baf8a2eeae2e4fc19f12a9f35b106b0c (diff) | |
| download | android_packages_apps_Snap-ce41d9869c7f4d747ccc85a6a2e8f285be0197c2.tar.gz android_packages_apps_Snap-ce41d9869c7f4d747ccc85a6a2e8f285be0197c2.tar.bz2 android_packages_apps_Snap-ce41d9869c7f4d747ccc85a6a2e8f285be0197c2.zip | |
Latest UI
bug:7233983
bug:7233980
Also fixes border scaling issues.
Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
Diffstat (limited to 'src/com/android/gallery3d/filtershow/presets/ImagePreset.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index a7b4b4090..ec0ed7402 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -153,15 +153,15 @@ public class ImagePreset { // First we apply any transform -- 90 rotate, flip, straighten, crop Bitmap bitmap = mGeoData.apply(original, mScaleFactor, mIsHighQuality); - if (mImageBorder != null) { - bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality); - } - for (int i = 0; i < mFilters.size(); i++) { ImageFilter filter = mFilters.elementAt(i); bitmap = filter.apply(bitmap, mScaleFactor, mIsHighQuality); } + if (mImageBorder != null) { + bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality); + } + if (mEndPoint != null) { mEndPoint.updateFilteredImage(bitmap); } |