summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/MasterImage.java23
1 files changed, 4 insertions, 19 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index f4b97b710..5e9ec7a7a 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -19,6 +19,7 @@ package com.android.gallery3d.filtershow.imageshow;
import android.graphics.Bitmap;
import android.graphics.RectF;
+import com.android.gallery3d.app.Log;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.HistoryAdapter;
import com.android.gallery3d.filtershow.ImageStateAdapter;
@@ -88,7 +89,6 @@ public class MasterImage {
mHistory.addHistoryItem(mPreset);
}
updatePresets(true);
- requestImages();
}
private void setGeometry() {
@@ -161,35 +161,23 @@ public class MasterImage {
}
public Bitmap getFilteredImage() {
- requestImages();
- mFilteredPreview.swapConsumer();
return mFilteredPreview.getConsumer();
}
public Bitmap getFiltersOnlyImage() {
- requestImages();
- mFiltersOnlyPreview.swapConsumer();
return mFiltersOnlyPreview.getConsumer();
}
public Bitmap getGeometryOnlyImage() {
- requestImages();
- mGeometryOnlyPreview.swapConsumer();
return mGeometryOnlyPreview.getConsumer();
}
public void notifyObservers() {
- requestImages();
for (ImageShow observer : mObservers) {
observer.invalidate();
}
}
- public void updatedCache() {
- requestImages();
- notifyObservers();
- }
-
public void updatePresets(boolean force) {
if (force || mGeometryOnlyPreset == null) {
ImagePreset newPreset = new ImagePreset(mPreset);
@@ -208,16 +196,13 @@ public class MasterImage {
}
}
mActivity.enableSave(hasModifications());
+ updateBuffers();
}
- public void requestImages() {
- if (mLoader == null) {
- return;
- }
-
- updatePresets(false);
+ public void updateBuffers() {
FilteringPipeline.getPipeline().updatePreviewBuffer();
FilteringPipeline.getPipeline().updateGeometryOnlyPreviewBuffer();
FilteringPipeline.getPipeline().updateFiltersOnlyPreviewBuffer();
}
+
}