diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-03-11 18:41:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-11 18:41:39 +0000 |
| commit | 91cd1c2654ed9d7540be06569b548569aa9ecd28 (patch) | |
| tree | 1a51986aa18bcd78c45f58a428566afc013d93f4 /src/com/android/gallery3d/filtershow/cache | |
| parent | 6320d90fb41fe1276a02b17fa27a660e76f21ba8 (diff) | |
| download | android_packages_apps_Snap-91cd1c2654ed9d7540be06569b548569aa9ecd28.tar.gz android_packages_apps_Snap-91cd1c2654ed9d7540be06569b548569aa9ecd28.tar.bz2 android_packages_apps_Snap-91cd1c2654ed9d7540be06569b548569aa9ecd28.zip | |
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea
Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b
Diffstat (limited to 'src/com/android/gallery3d/filtershow/cache')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java index 08ed40311..6cf462269 100644 --- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java +++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java @@ -520,7 +520,7 @@ public class ImageLoader { preset.setQuality(ImagePreset.QUALITY_FINAL); preset.setScaleFactor(1.0f); - BitmapTask.Callbacks<ImagePreset, Bitmap> cb = new BitmapTask.Callbacks<ImagePreset, Bitmap>() { + BitmapTask.Callbacks<ImagePreset> cb = new BitmapTask.Callbacks<ImagePreset>() { @Override public void onComplete(Bitmap result) { @@ -570,7 +570,7 @@ public class ImageLoader { } }; - (new BitmapTask<ImagePreset, Bitmap>(cb)).execute(preset); + (new BitmapTask<ImagePreset>(cb)).execute(preset); } private String getFileExtension(String requestFormat) { @@ -604,7 +604,7 @@ public class ImageLoader { final InterruptableOutputStream ios = new InterruptableOutputStream(out); - BitmapTask.Callbacks<Bitmap, Bitmap> cb = new BitmapTask.Callbacks<Bitmap, Bitmap>() { + BitmapTask.Callbacks<Bitmap> cb = new BitmapTask.Callbacks<Bitmap>() { @Override public void onComplete(Bitmap result) { @@ -618,9 +618,6 @@ public class ImageLoader { @Override public Bitmap onExecute(Bitmap param) { - if (param == null) { - return null; - } CompressFormat cf = convertExtensionToCompressFormat(getFileExtension(outputFormat)); param.compress(cf, DEFAULT_COMPRESS_QUALITY, ios); Utils.closeSilently(ios); @@ -628,7 +625,7 @@ public class ImageLoader { } }; - (new BitmapTask<Bitmap, Bitmap>(cb)).execute(bmap); + (new BitmapTask<Bitmap>(cb)).execute(bmap); } public void setAdapter(HistoryAdapter adapter) { |