Merge remote-tracking branch 'upstream/master'

codeanticode · codeanticode · commit f18c9d06e08c · 2014-11-16T17:36:04.000-07:00
diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
@@ -2626,7 +2626,7 @@ public void loadPixels() {
   @Override
   public void updatePixels(int x, int y, int c, int d) {
     //if ((x == 0) && (y == 0) && (c == width) && (d == height)) {
-    System.err.format("%d %d %d %d .. w/h = %d %d .. pw/ph = %d %d %n", x, y, c, d, width, height, pixelWidth, pixelHeight);
+//    System.err.format("%d %d %d %d .. w/h = %d %d .. pw/ph = %d %d %n", x, y, c, d, width, height, pixelWidth, pixelHeight);
     if ((x != 0) || (y != 0) || (c != pixelWidth) || (d != pixelHeight)) {
       // Show a warning message, but continue anyway.
       showVariationWarning("updatePixels(x, y, w, h)");
diff --git a/core/src/processing/core/PSurfaceAWT.java b/core/src/processing/core/PSurfaceAWT.java
@@ -1379,13 +1379,9 @@ public void run() {  // not good to make this synchronized, locks things up
 
         // Don't resize the renderer from the EDT (i.e. from a ComponentEvent),
         // otherwise it may attempt a resize mid-render.
-//        if (g != null) {
-        Dimension currentSize = canvas.getSize();
-        if (currentSize.width != sketchWidth || currentSize.height != sketchHeight) {
-          //resizeRenderer(currentSize.width, currentSize.height);
-          //System.err.format("need to resize from %s to %d, %d", currentSize, graphics.width, graphics.height);
-          System.err.format("need to resize from %s to %d, %d%n", currentSize, sketchWidth, sketchHeight);
-        }
+//        Dimension currentSize = canvas.getSize();
+//        if (currentSize.width != sketchWidth || currentSize.height != sketchHeight) {
+//          System.err.format("need to resize from %s to %d, %d%n", currentSize, sketchWidth, sketchHeight);
 //        }
 
         // render a single frame
