Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index b571ec6..e6e2953 100644 (file)
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -334,7 +334,6 @@ public class ImagePreset {
 
     public Bitmap apply(Bitmap original) {
         Bitmap bitmap = original;
-//        bitmap = applyGeometry(bitmap);
         bitmap = applyFilters(bitmap, -1, -1);
         return applyBorder(bitmap);
     }

diff --git a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
index 4bc973e..38a9a3a 100644 (file)
--- a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
+++ b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
@@ -178,6 +178,7 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> {
             if (bitmap == null) {
                 return null;
             }
+            bitmap = preset.applyGeometry(bitmap);
             bitmap = preset.apply(bitmap);
 
             Object xmp = null;