add special case for image() with degenerate PGraphics (fixes processing#2208)

benfry · benfry · commit 9b596185ade7 · 2014-07-30T22:03:51.000-04:00
diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
@@ -1301,6 +1301,11 @@ protected void imageImpl(PImage who,
     }
 
     if (who.modified) {
+      if (who.pixels == null) {
+        // This might be a PGraphics that hasn't been drawn to yet, bail out.
+        // https://github.com/processing/processing/issues/2208
+        return;
+      }
       cash.update(who, tint, tintColor);
       who.modified = false;
     }
diff --git a/core/todo.txt b/core/todo.txt
@@ -6,6 +6,8 @@ X move to native OS X full screen (gets rid of native code)
 X   https://github.com/processing/processing/issues/2641
 X do bounds check on setVertex(PVector)
 X   https://github.com/processing/processing/issues/2556
+X using createGraphics() w/o begin/endDraw(), don't attempt drawing w/ image()
+X   https://github.com/processing/processing/issues/2208
 
 data
 X add copy() method to Table
diff --git a/todo.txt b/todo.txt
@@ -33,6 +33,11 @@ X   https://github.com/processing/processing/issues/2656
 X add a new pref for the 3.0 sketchbook location
 X if Server constructor fails, throw an exception
 X   https://github.com/processing/processing/issues/2604
+o check on why 2x core.jar inside the Java folder
+o   maybe OS X Java can't look in subfolders? (just auto-adds things)
+o   https://github.com/processing/processing/issues/2344
+X   one is used by the PDE, the other is used as a library
+_ changing the mode on an untitled, unmodified sketch removes untitled status
 _ when renaming a tab, include the previous name to be edited
 
 gsoc
@@ -109,8 +114,6 @@ _   http://www.java2s.com/Code/Java/Network-Protocol/DetectProxySettingsforInter
 
 medium
 _ possibility of libraries folder inside a particular sketch?
-_ check on why 2x core.jar inside the Java folder
-_   maybe OS X Java can't look in subfolders? (just auto-adds things)
 _ display "1" is not correct in 2.1.2
 _   https://github.com/processing/processing/issues/2502
 _ re/move things from Google Code downloads

Original file line number	Diff line number	Diff line change
`@@ -1301,6 +1301,11 @@ protected void imageImpl(PImage who,`
`1301`	`1301`	`}`
`1302`	`1302`
`1303`	`1303`	`if (who.modified) {`
	`1304`	`+ if (who.pixels == null) {`
	`1305`	`+ // This might be a PGraphics that hasn't been drawn to yet, bail out.`
	`1306`	`+ // https://github.com/processing/processing/issues/2208`
	`1307`	`+ return;`
	`1308`	`+ }`
`1304`	`1309`	`cash.update(who, tint, tintColor);`
`1305`	`1310`	`who.modified = false;`
`1306`	`1311`	`}`