Merge remote-tracking branch 'upstream/master'

This commit is contained in:
codeanticode
2014-11-16 17:36:04 -07:00
2 changed files with 4 additions and 8 deletions

View File

@@ -2626,7 +2626,7 @@ public class PGraphicsJava2D extends PGraphics {
@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)");

View File

@@ -1379,13 +1379,9 @@ public class PSurfaceAWT implements PSurface {
// 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