From bd4c46989171b5171797e0dbf4b33a1914ffba49 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Tue, 12 Feb 2013 13:42:19 -0800
Subject: fix the draw clear bug

Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
---
 src/com/android/gallery3d/filtershow/editors/EditorDraw.java          | 4 ++--
 .../gallery3d/filtershow/filters/FilterDrawRepresentation.java        | 3 +++
 src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java     | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/com/android/gallery3d')

diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java
index 907d1083e..aa5ec61e8 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java
@@ -121,8 +121,8 @@ public class EditorDraw extends Editor {
                     ImageDraw idraw = (ImageDraw) mImageShow;
                     idraw.setStyle(ImageFilterDraw.SIMPLE_STYLE);
                 } else if (item.getItemId() == R.id.draw_menu_clear) {
-                    FilterDrawRepresentation drawRep = (FilterDrawRepresentation) getLocalRepresentation();
-                    drawRep.clear();
+                    ImageDraw idraw = (ImageDraw) mImageShow;
+                    idraw.resetParameter();
                     commitLocalRepresentation();
                 }
                 mView.invalidate();
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
index 89ea5ccc5..e41f0a622 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -94,7 +94,10 @@ public class FilterDrawRepresentation extends FilterRepresentation {
                 }
                 if (representation.mDrawing != null) {
                     mDrawing = (Vector<StrokeData>) representation.mDrawing.clone();
+                } else {
+                    mDrawing = null;
                 }
+
             } catch (CloneNotSupportedException e) {
                 e.printStackTrace();
             }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
index 9d22f7a6f..9fa4ce97e 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
@@ -224,7 +224,8 @@ public class ImageFilterDraw extends ImageFilter {
 
         if (mOverlayBitmap == null ||
                 mOverlayBitmap.getWidth() != canvas.getWidth() ||
-                mOverlayBitmap.getHeight() != canvas.getHeight()) {
+                mOverlayBitmap.getHeight() != canvas.getHeight() ||
+                mParameters.getDrawing().size() < mCachedStrokes) {
 
             mOverlayBitmap = Bitmap.createBitmap(
                     canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
-- 
cgit v1.2.3