fix incorrect mx2/my2 calculations in PImage

benfry · benfry · commit 9a4db4b68485 · 2013-06-03T10:29:59.000-04:00
diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java
@@ -533,21 +533,27 @@ public void updatePixels(int x, int y, int w, int h) {  // ignore
 
     if (!modified) {
       mx1 = PApplet.max(0, x);
-      mx2 = PApplet.min(width - 1, x2);
+      //mx2 = PApplet.min(width - 1, x2);
+      mx2 = PApplet.min(width, x2);
       my1 = PApplet.max(0, y);
-      my2 = PApplet.min(height - 1, y2);
+      //my2 = PApplet.min(height - 1, y2);
+      my2 = PApplet.min(height, y2);
       modified = true;
 
     } else {
       if (x < mx1) mx1 = PApplet.max(0, x);
-      if (x > mx2) mx2 = PApplet.min(width - 1, x);
+      //if (x > mx2) mx2 = PApplet.min(width - 1, x);
+      if (x > mx2) mx2 = PApplet.min(width, x);
       if (y < my1) my1 = PApplet.max(0, y);
-      if (y > my2) my2 = y;
+      //if (y > my2) my2 = y;
+      if (y > my2) my2 = PApplet.min(height, y);
 
       if (x2 < mx1) mx1 = PApplet.max(0, x2);
-      if (x2 > mx2) mx2 = PApplet.min(width - 1, x2);
+      //if (x2 > mx2) mx2 = PApplet.min(width - 1, x2);
+      if (x2 > mx2) mx2 = PApplet.min(width, x2);
       if (y2 < my1) my1 = PApplet.max(0, y2);
-      if (y2 > my2) my2 = PApplet.min(height - 1, y2);
+      //if (y2 > my2) my2 = PApplet.min(height - 1, y2);
+      if (y2 > my2) my2 = PApplet.min(height, y2);
     }
   }
 
