diff options
| author | Chris Craik <ccraik@google.com> | 2013-08-21 17:22:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-21 17:22:24 +0000 |
| commit | dc70afaeabd7acacc07e8852b15cc820cd07531c (patch) | |
| tree | 6c52edfe53193901284f923a9fa3c4c28631d567 /core/java/android | |
| parent | 10fa8c0626dbc0a875fe2543bf3c14d617dee9fb (diff) | |
| parent | 1abf5d62429e5a9329520b2f7c2b5a5e7a8e72ec (diff) | |
Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/GLES20Canvas.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index d2d1f1b396dc..beefc21faf84 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -776,7 +776,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawPatch(NinePatch patch, Rect dst, Paint paint) { Bitmap bitmap = patch.getBitmap(); - if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); + throwIfCannotDraw(bitmap); // Shaders are ignored when drawing patches int modifier = paint != null ? setupColorFilter(paint) : MODIFIER_NONE; try { @@ -791,7 +791,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawPatch(NinePatch patch, RectF dst, Paint paint) { Bitmap bitmap = patch.getBitmap(); - if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); + throwIfCannotDraw(bitmap); // Shaders are ignored when drawing patches int modifier = paint != null ? setupColorFilter(paint) : MODIFIER_NONE; try { @@ -808,7 +808,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, float left, float top, Paint paint) { - if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); + throwIfCannotDraw(bitmap); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; try { @@ -824,7 +824,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, Matrix matrix, Paint paint) { - if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); + throwIfCannotDraw(bitmap); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; try { @@ -841,7 +841,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, Rect src, Rect dst, Paint paint) { - if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); + throwIfCannotDraw(bitmap); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; try { @@ -868,7 +868,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, Rect src, RectF dst, Paint paint) { - if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); + throwIfCannotDraw(bitmap); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; try { @@ -944,7 +944,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmapMesh(Bitmap bitmap, int meshWidth, int meshHeight, float[] verts, int vertOffset, int[] colors, int colorOffset, Paint paint) { - if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); + throwIfCannotDraw(bitmap); if (meshWidth < 0 || meshHeight < 0 || vertOffset < 0 || colorOffset < 0) { throw new ArrayIndexOutOfBoundsException(); } |