Refactoring ImageLoader.

- Moves state (history, loadlisteners, bitmaps, etc.)
  from ImageLoader to MasterImage.
- Makes ImageLoader into a utility class.

Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c

1 files changed, 3 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index 05fdffbf7..050dc436b 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -23,6 +23,7 @@ import android.support.v8.renderscript.Allocation;
 import android.widget.Toast;
 
 import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
+import com.android.gallery3d.filtershow.imageshow.MasterImage;
 import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;
 import com.android.gallery3d.filtershow.pipeline.ImagePreset;
 
@@ -91,8 +92,8 @@ public abstract class ImageFilter implements Cloneable {
         ImagePreset preset = getEnvironment().getImagePreset();
         GeometryMetadata geo = getEnvironment().getImagePreset().getGeometry();
         Matrix originalToScreen = geo.getOriginalToScreen(true,
-                preset.getImageLoader().getOriginalBounds().width(),
-                preset.getImageLoader().getOriginalBounds().height(),
+                MasterImage.getImage().getOriginalBounds().width(),
+                MasterImage.getImage().getOriginalBounds().height(),
                 w, h);
         return originalToScreen;
     }