From 3a24d6784060a4ced1f6dbc0b1496ea42e023eb6 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Thu, 30 May 2013 10:56:42 -0400 Subject: [PATCH] Added loaded flag to PImage, removed cache object introspection in loadPixels() --- core/src/processing/core/PImage.java | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java index 5887c9d55..7fe543a62 100644 --- a/core/src/processing/core/PImage.java +++ b/core/src/processing/core/PImage.java @@ -27,7 +27,6 @@ package processing.core; import java.awt.*; import java.awt.image.*; import java.io.*; -import java.lang.reflect.Method; import java.util.Iterator; import javax.imageio.*; @@ -139,6 +138,8 @@ public class PImage implements PConstants, Cloneable { protected boolean modified; protected int mx1, my1, mx2, my2; + /** Loaded pixels flag */ + public boolean loaded = false; // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . @@ -472,7 +473,9 @@ public class PImage implements PConstants, Cloneable { if (pixels == null || pixels.length != width*height) { pixels = new int[width*height]; } + isLoaded(); +/* if (parent != null) { Object cache = parent.g.initCache(this); if (cache != null) { @@ -490,6 +493,7 @@ public class PImage implements PConstants, Cloneable { } } } +*/ } @@ -710,6 +714,25 @@ public class PImage implements PConstants, Cloneable { } + ////////////////////////////////////////////////////////////// + + // MARKING IMAGE AS LOADED / FOR USE IN RENDERERS + + + public boolean isLoaded() { // ignore + return loaded; + } + + + public void setLoaded() { // ignore + loaded = true; + } + + + public void setLoaded(boolean l) { // ignore + loaded = l; + } + //////////////////////////////////////////////////////////////