From 695ac5fd3ebe5d5b87e6b5782773a9f1e84369c0 Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 28 Feb 2010 19:36:12 +0000 Subject: [PATCH] another bug fix for set() and resize() --- .../core/src/processing/core/PGraphicsAndroid2D.java | 11 +++++------ android/core/src/processing/core/PImage.java | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/core/src/processing/core/PGraphicsAndroid2D.java b/android/core/src/processing/core/PGraphicsAndroid2D.java index 8f34a2561..5fc2e9dba 100644 --- a/android/core/src/processing/core/PGraphicsAndroid2D.java +++ b/android/core/src/processing/core/PGraphicsAndroid2D.java @@ -1826,13 +1826,12 @@ public class PGraphicsAndroid2D extends PGraphics { src.bitmap.setPixels(src.pixels, 0, src.width, 0, 0, src.width, src.height); src.modified = false; } + // set() happens in screen coordinates, so need to clear the ctm + canvas.save(Canvas.MATRIX_SAVE_FLAG); + canvas.setMatrix(null); // set to identity + canvas.drawBitmap(src.bitmap, x, y, null); + canvas.restore(); } - - // set() happens in screen coordinates, so need to clear the ctm - canvas.save(Canvas.MATRIX_SAVE_FLAG); - canvas.setMatrix(null); // set to identity - canvas.drawBitmap(src.bitmap, x, y, null); - canvas.restore(); } diff --git a/android/core/src/processing/core/PImage.java b/android/core/src/processing/core/PImage.java index a6f4f987f..f87d52c40 100644 --- a/android/core/src/processing/core/PImage.java +++ b/android/core/src/processing/core/PImage.java @@ -364,6 +364,7 @@ public class PImage implements PConstants, Cloneable { width = 0; // Gimme a break, don't waste my time height = 0; pixels = new int[0]; + bitmap = null; } else { if (wide == 0) { // Use height to determine relative size