bring back getImage() to fix processing#4473

benfry · benfry · commit f8d77c86b1c4 · 2016-08-12T21:34:50.000-04:00
diff --git a/core/src/processing/awt/PGraphicsJava2D.java b/core/src/processing/awt/PGraphicsJava2D.java
@@ -253,6 +253,16 @@ public PSurface createSurface() {
   }
 
 
+  /**
+   * Still need a means to get the java.awt.Image object, since getNative()
+   * is going to return the {@link Graphics2D} object.
+   */
+  @Override
+  public Image getImage() {
+    return image;
+  }
+
+
   /** Returns the java.awt.Graphics2D object used by this renderer. */
   @Override
   public Object getNative() {
diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java
@@ -345,8 +345,8 @@ public PImage(Image img) {
   /**
    * Use the getNative() method instead, which allows library interfaces to be
    * written in a cross-platform fashion for desktop, Android, and others.
+   * This is still included for PGraphics objects, which may need the image.
    */
-  @Deprecated
   public Image getImage() {  // ignore
     return (Image) getNative();
   }
diff --git a/core/todo.txt b/core/todo.txt
@@ -2,6 +2,7 @@
 X some Table cleanup based on other CSV parsing work
 X use StandardCharsets.UTF_8 instead of getting encoding by name
 X PApplet.main(Blah.class) now works
+o add push() and pop() methods to mirror js?
 X add toJSON() method to IntDict
 X   had to use JSONObject.quote() to wrap the text
 _   do the same for the other data classes
@@ -19,7 +20,7 @@ X   https://github.com/processing/processing/issues/4265
 X   https://github.com/processing/processing/pull/4268
 
 
-_ disable OpenGL ES on Linux? 
+_ option to disable OpenGL ES on Linux? 
 _   https://github.com/processing/processing/issues/4584
 
 _ Can't render PGraphics object using image() within a PDF
@@ -33,10 +34,6 @@ _ textAlign(CENTER) and pixelDensity(2) aligning incorrectly with Java2D
 _   https://github.com/processing/processing/issues/4020
 _ add increment() that takes IntDict to merge things
 
-_ normalize error messages for missing files
-_   https://github.com/processing/processing/issues/4265
-_   https://github.com/processing/processing/pull/4268
-
 _ should fullScreen() set width and height to displayWidth/Height
 _   or is that being set/unset used for any state info?
 _ when calling exit(), if sketch has halted w/ exception, force the quit
@@ -45,7 +42,6 @@ _   simple test case: using size() inside setup() from Eclipse
 
 
 discussion
-_ add push() and pop() methods to mirror js?
 _ how to handle the touch api
 _ figure our size(img.width, img.height) situation
 _   just make loadImage() work in settings
diff --git a/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java b/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java
@@ -423,7 +423,7 @@ protected void imageImpl(PImage image,
     scale((x2 - x1) / imageWidth,
           (y2 - y1) / imageHeight);
     if (u2-u1 == imageWidth && v2-v1 == imageHeight) {
-      g2.drawImage((Image) image.getNative(), 0, 0, null);
+      g2.drawImage(image.getImage(), 0, 0, null);
     } else {
       PImage tmp = image.get(u1, v1, u2-u1, v2-v1);
       g2.drawImage((Image) tmp.getNative(), 0, 0, null);
