From 661c80d16b699c24ab12b44b0572f589c824c8e8 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Wed, 15 Aug 2012 04:33:20 +0000 Subject: [PATCH] removed old cruft --- android/core/src/processing/core/PApplet.java | 5 ---- android/core/src/processing/core/PFont.java | 30 ++----------------- android/core/src/processing/core/PImage.java | 26 ---------------- core/andres.txt | 2 +- core/src/processing/core/PApplet.java | 6 ---- core/src/processing/core/PFont.java | 25 ---------------- core/src/processing/core/PGraphicsJava2D.java | 5 +--- core/src/processing/core/PImage.java | 25 ---------------- 8 files changed, 4 insertions(+), 120 deletions(-) diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java index 7dc8280d4..a8e2f2097 100644 --- a/android/core/src/processing/core/PApplet.java +++ b/android/core/src/processing/core/PApplet.java @@ -8935,11 +8935,6 @@ public class PApplet extends Activity implements PConstants, Runnable { } - public void delete() { - g.delete(); - } - - public Bitmap getBitmap() { return g.getBitmap(); } diff --git a/android/core/src/processing/core/PFont.java b/android/core/src/processing/core/PFont.java index 7e54fa78d..57ec06ab6 100644 --- a/android/core/src/processing/core/PFont.java +++ b/android/core/src/processing/core/PFont.java @@ -323,34 +323,8 @@ public class PFont implements PConstants { smooth = is.readBoolean(); } } - - - void delete() { - if (cacheMap != null) { - Set keySet = cacheMap.keySet(); - if (!keySet.isEmpty()) { - Object[] keys = keySet.toArray(); - for (int i = 0; i < keys.length; i++) { - Object data = getCache((PGraphics)keys[i]); - Method del = null; - - try { - Class c = data.getClass(); - del = c.getMethod("delete", new Class[] {}); - } catch (Exception e) {} - - if (del != null) { - // The metadata have a delete method. We try running it. - try { - del.invoke(data, new Object[] {}); - } catch (Exception e) {} - } - } - } - } - } - - + + /** * Write this PFont to an OutputStream. *

diff --git a/android/core/src/processing/core/PImage.java b/android/core/src/processing/core/PImage.java index 188a671c8..9174f7e59 100644 --- a/android/core/src/processing/core/PImage.java +++ b/android/core/src/processing/core/PImage.java @@ -145,32 +145,6 @@ public class PImage implements PConstants, Cloneable { } - public void delete() { - if (cacheMap != null) { - Set keySet = cacheMap.keySet(); - if (!keySet.isEmpty()) { - Object[] keys = keySet.toArray(); - for (int i = 0; i < keys.length; i++) { - Object data = getCache((PGraphics)keys[i]); - Method del = null; - - try { - Class c = data.getClass(); - del = c.getMethod("delete", new Class[] {}); - } catch (Exception e) {} - - if (del != null) { - // The metadata have a delete method. We try running it. - try { - del.invoke(data, new Object[] {}); - } catch (Exception e) {} - } - } - } - } - } - - /** * Check the alpha on an image, using a really primitive loop. */ diff --git a/core/andres.txt b/core/andres.txt index 576069bec..8b53d0fac 100644 --- a/core/andres.txt +++ b/core/andres.txt @@ -8,10 +8,10 @@ _ Have Capture.list() return all supported resolutions, and use the string as th _ for the capture object _ Add DISABLE_PERSPECTIVE_CORRECTED_STROKE hint, remove DISABLE_PERSPECTIVE_CORRECTED_LINES _ Rename shader constants (FLAT, LIT, TEXTURED, etc), resetShader() w/out args? -_ Cleaner Implementation of PImage.loadPixels() _ Back-buffer support in shaders: http://code.google.com/p/processing/issues/detail?id=1169 processing-core todo (after beta): +_ Cleaner Implementation of PImage.loadPixels() _ some glitches with SVG shapes in P2D _ load world.svg and disable style) _ simple bevel algorithm for retained mode tessellation diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 94ec56ead..424cf76d1 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -13983,12 +13983,6 @@ public class PApplet extends Applet } - public void delete() { - if (recorder != null) recorder.delete(); - g.delete(); - } - - /** * Store data of some kind for a renderer that requires extra metadata of * some kind. Usually this is a renderer-specific representation of the diff --git a/core/src/processing/core/PFont.java b/core/src/processing/core/PFont.java index 9c58b1164..58c0a4041 100644 --- a/core/src/processing/core/PFont.java +++ b/core/src/processing/core/PFont.java @@ -395,31 +395,6 @@ public class PFont implements PConstants { findFont(); } - - void delete() { - if (cacheMap != null) { - Set keySet = cacheMap.keySet(); - if (!keySet.isEmpty()) { - Object[] keys = keySet.toArray(); - for (int i = 0; i < keys.length; i++) { - Object data = getCache((PGraphics)keys[i]); - Method del = null; - - try { - Class c = data.getClass(); - del = c.getMethod("delete", new Class[] {}); - } catch (Exception e) {} - - if (del != null) { - // The metadata have a delete method. We try running it. - try { - del.invoke(data, new Object[] {}); - } catch (Exception e) {} - } - } - } - } - } /** * Write this PFont to an OutputStream. diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java index c0a9a2af3..84aa3c496 100644 --- a/core/src/processing/core/PGraphicsJava2D.java +++ b/core/src/processing/core/PGraphicsJava2D.java @@ -970,10 +970,7 @@ public class PGraphicsJava2D extends PGraphics /*PGraphics2D*/ { //System.out.println("making new buffered image"); // image = new BufferedImage(source.width, source.height, type); } - - public void delete() { - } - + /** * Update the pixels of the cache image. Already determined that the tint * has changed, or the pixels have changed, so should just go through diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java index cf9904b21..92bc330aa 100644 --- a/core/src/processing/core/PImage.java +++ b/core/src/processing/core/PImage.java @@ -306,31 +306,6 @@ public class PImage implements PConstants, Cloneable { } - public void delete() { - if (cacheMap != null) { - Set keySet = cacheMap.keySet(); - if (!keySet.isEmpty()) { - Object[] keys = keySet.toArray(); - for (int i = 0; i < keys.length; i++) { - Object data = getCache((PGraphics)keys[i]); - Method del = null; - - try { - Class c = data.getClass(); - del = c.getMethod("delete", new Class[] {}); - } catch (Exception e) {} - - if (del != null) { - // The metadata have a delete method. We try running it. - try { - del.invoke(data, new Object[] {}); - } catch (Exception e) {} - } - } - } - } - } - ////////////////////////////////////////////////////////////// // METADATA/PARAMETERS REQUIRED BY RENDERERS