From f26b3580d1f2f9a3736fb77aebf0ebb9d5a33001 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Mon, 25 Feb 2013 17:18:51 -0800 Subject: Fixed more of filtershows large bitmap reference leaks. Bug: 8253109 Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772 --- .../gallery3d/filtershow/FilterShowActivity.java | 3 + .../filtershow/cache/FilteringPipeline.java | 1 - .../filtershow/filters/BaseFiltersManager.java | 64 +++++++++------------- .../gallery3d/filtershow/presets/ImagePreset.java | 1 - .../gallery3d/filtershow/ui/ImageCurves.java | 1 - .../filtershow/filters/FiltersManager.java | 19 +++++-- 6 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index fd30ac080..92aed8425 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -521,9 +521,12 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, if (mLoadBitmapTask != null) { mLoadBitmapTask.cancel(false); } + // TODO: Using singletons is a bad design choice for many of these + // due static reference leaks and in general. Please refactor. MasterImage.reset(); FilteringPipeline.reset(); ImageFilter.resetStatics(); + FiltersManager.reset(); super.onDestroy(); } diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java index 0af406316..ec08e488e 100644 --- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java @@ -22,7 +22,6 @@ import android.os.Process; import android.support.v8.renderscript.*; import android.util.Log; -import com.android.gallery3d.filtershow.filters.BaseFiltersManager; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilterRS; import com.android.gallery3d.filtershow.imageshow.GeometryMetadata; diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java index 377bd2b6f..4dbf91a33 100644 --- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java +++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java @@ -13,49 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.android.gallery3d.filtershow.filters; -import com.android.gallery3d.filtershow.cache.ImageLoader; - import java.util.HashMap; +import java.util.Map; import java.util.Vector; -public class BaseFiltersManager { - - private static final String LOGTAG = "BaseFiltersManager"; - private static HashMap mFilters = new HashMap(); - - protected BaseFiltersManager() { - Vector filters = new Vector(); - addFilters(filters); - for (ImageFilter filter : filters) { - mFilters.put(filter.getClass(), filter); - } - } +public abstract class BaseFiltersManager { + protected HashMap mFilters = null; - protected void addFilters(Vector filters) { - filters.add(new ImageFilterTinyPlanet()); - filters.add(new ImageFilterRedEye()); - filters.add(new ImageFilterWBalance()); - filters.add(new ImageFilterExposure()); - filters.add(new ImageFilterVignette()); - filters.add(new ImageFilterContrast()); - filters.add(new ImageFilterShadows()); - filters.add(new ImageFilterHighlights()); - filters.add(new ImageFilterVibrance()); - filters.add(new ImageFilterSharpen()); - filters.add(new ImageFilterCurves()); - filters.add(new ImageFilterDraw()); - filters.add(new ImageFilterHue()); - filters.add(new ImageFilterSaturated()); - filters.add(new ImageFilterBwFilter()); - filters.add(new ImageFilterNegative()); - filters.add(new ImageFilterEdge()); - filters.add(new ImageFilterKMeans()); - filters.add(new ImageFilterFx()); - filters.add(new ImageFilterBorder()); - filters.add(new ImageFilterParametricBorder()); + protected void addFilters(Map filters) { + filters.put(ImageFilterTinyPlanet.class, new ImageFilterTinyPlanet()); + filters.put(ImageFilterRedEye.class, new ImageFilterRedEye()); + filters.put(ImageFilterWBalance.class, new ImageFilterWBalance()); + filters.put(ImageFilterExposure.class, new ImageFilterExposure()); + filters.put(ImageFilterVignette.class, new ImageFilterVignette()); + filters.put(ImageFilterContrast.class, new ImageFilterContrast()); + filters.put(ImageFilterShadows.class, new ImageFilterShadows()); + filters.put(ImageFilterHighlights.class, new ImageFilterHighlights()); + filters.put(ImageFilterVibrance.class, new ImageFilterVibrance()); + filters.put(ImageFilterSharpen.class, new ImageFilterSharpen()); + filters.put(ImageFilterCurves.class, new ImageFilterCurves()); + filters.put(ImageFilterDraw.class, new ImageFilterDraw()); + filters.put(ImageFilterHue.class, new ImageFilterHue()); + filters.put(ImageFilterSaturated.class, new ImageFilterSaturated()); + filters.put(ImageFilterBwFilter.class, new ImageFilterBwFilter()); + filters.put(ImageFilterNegative.class, new ImageFilterNegative()); + filters.put(ImageFilterEdge.class, new ImageFilterEdge()); + filters.put(ImageFilterKMeans.class, new ImageFilterKMeans()); + filters.put(ImageFilterFx.class, new ImageFilterFx()); + filters.put(ImageFilterBorder.class, new ImageFilterBorder()); + filters.put(ImageFilterParametricBorder.class, new ImageFilterParametricBorder()); } public ImageFilter getFilter(Class c) { @@ -79,7 +67,7 @@ public class BaseFiltersManager { } public void addLooks(Vector representations) { - // subclass can add representations + // Override } public void addEffects(Vector representations) { diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index ae5a03414..fd5cd0d6f 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -22,7 +22,6 @@ import android.util.Log; import com.android.gallery3d.filtershow.ImageStateAdapter; import com.android.gallery3d.filtershow.cache.ImageLoader; -import com.android.gallery3d.filtershow.filters.BaseFiltersManager; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilter; diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java index e54c83eff..3e52f5ee5 100644 --- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java +++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java @@ -35,7 +35,6 @@ import android.widget.PopupMenu; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.editors.EditorCurves; -import com.android.gallery3d.filtershow.filters.BaseFiltersManager; import com.android.gallery3d.filtershow.filters.FilterCurvesRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilterCurves; diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java index 988cf2d81..b05b54670 100644 --- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java +++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java @@ -16,13 +16,24 @@ package com.android.gallery3d.filtershow.filters; +import java.util.HashMap; + public class FiltersManager extends BaseFiltersManager { - private static FiltersManager gInstance = null; + private static FiltersManager sInstance = null; + + protected FiltersManager() { + mFilters = new HashMap(); + addFilters(mFilters); + } public static FiltersManager getManager() { - if (gInstance == null) { - gInstance = new FiltersManager(); + if (sInstance == null) { + sInstance = new FiltersManager(); } - return gInstance; + return sInstance; + } + + public static void reset() { + sInstance = null; } } -- cgit v1.2.3