fixes loadPixels() regression in opengl renderer

codeanticode · codeanticode · commit b8a98dc2dcb0 · 2014-05-05T14:33:22.000-04:00
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -6250,11 +6250,15 @@ protected PImage wrapTexture(Texture tex) {
 
   protected void updateTexture(PImage img, Texture tex) {
     if (tex != null) {
-      int x = img.getModifiedX1();
-      int y = img.getModifiedY1();
-      int w = img.getModifiedX2() - x;
-      int h = img.getModifiedY2() - y;
-      tex.set(img.pixels, x, y, w, h, img.format);
+      if (img.isModified()) {
+        int x = img.getModifiedX1();
+        int y = img.getModifiedY1();
+        int w = img.getModifiedX2() - x;
+        int h = img.getModifiedY2() - y;
+        tex.set(img.pixels, x, y, w, h, img.format);
+      } else if (img.isLoaded()) {
+        tex.set(img.pixels, 0, 0, img.width, img.height, img.format);
+      }
     }
     img.setModified(false);
     img.setLoaded(false);
diff --git a/core/src/processing/opengl/Texture.java b/core/src/processing/opengl/Texture.java
@@ -329,8 +329,7 @@ public void set(int[] pixels, int x, int y, int w, int h, int format) {
       return;
     }
 
-    if (pixels.length == 0) {
-      // Nothing to do (means that w == h == 0) but not an erroneous situation
+    if (pixels.length == 0 || w == 0 || h == 0) {
       return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,7 @@ public void set(int[] pixels, int x, int y, int w, int h, int format) {`
`329`	`329`	`return;`
`330`	`330`	`}`
`331`	`331`
`332`		`- if (pixels.length == 0) {`
`333`		`- // Nothing to do (means that w == h == 0) but not an erroneous situation`
	`332`	`+ if (pixels.length == 0 \|\| w == 0 \|\| h == 0) {`
`334`	`333`	`return;`
`335`	`334`	`}`
`336`	`335`