diff options
| author | John Hoford <hoford@google.com> | 2013-02-13 00:07:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-13 00:07:43 +0000 |
| commit | dff54430a7f6a11dc8ef45496f2836a853bd6d42 (patch) | |
| tree | 2bbdf39a590fac0b04ea9a4d00ea82e46a213579 /src | |
| parent | e5349356383416c813db70544624cf2f3d72a65c (diff) | |
| parent | bd4c46989171b5171797e0dbf4b33a1914ffba49 (diff) | |
| download | android_packages_apps_Snap-dff54430a7f6a11dc8ef45496f2836a853bd6d42.tar.gz android_packages_apps_Snap-dff54430a7f6a11dc8ef45496f2836a853bd6d42.tar.bz2 android_packages_apps_Snap-dff54430a7f6a11dc8ef45496f2836a853bd6d42.zip | |
Merge "fix the draw clear bug" into gb-ub-photos-bryce
Diffstat (limited to 'src')
3 files changed, 7 insertions, 3 deletions
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); |