ported fixes from RC

Author: codeanticode

core/src/processing/core/PImage.java

@@ -373,6 +373,10 @@ public Object clone() throws CloneNotSupportedException {  // ignore
    * Use 0 for wide or high to make that dimension scale proportionally.
    */
   public void resize(int w, int h) {  // ignore
+    if (bitmap == null) {
+      return; // Cannot resize an image not backed by a bitmap
+    }
+
     if (w <= 0 && h <= 0) {
       throw new IllegalArgumentException("width or height must be > 0 for resize");
     }
@@ -385,11 +389,15 @@ public void resize(int w, int h) {  // ignore
       h = (int) (height * diff);
     }
     bitmap = Bitmap.createScaledBitmap(bitmap, w, h, true);
+    if (pixels != null) {
+      // Resize pixels array, if in use.
+      pixels = new int[w * h];
+      bitmap.getPixels(pixels, 0, w, 0, 0, w, h);
+    }
     this.width = w;
     this.height = h;
-
-    // Mark the pixels array as altered
-    updatePixels();
+    this.pixelWidth = w * pixelDensity;
+    this.pixelHeight = h * pixelDensity;
   }
 
 
@@ -513,6 +521,8 @@ public PImage get(int x, int y, int w, int h) {
     target.parent = parent;  // parent may be null so can't use createImage()
     if (w > 0 && h > 0) {
       getImpl(x, y, w, h, target, targetX, targetY);
+      Bitmap nat = Bitmap.createBitmap(target.pixels, targetWidth, targetHeight, Config.ARGB_8888);
+      target.setNative(nat);
     }
     return target;
   }
@@ -527,11 +537,11 @@ public PImage get(int x, int y, int w, int h) {
   protected void getImpl(int sourceX, int sourceY,
                          int sourceWidth, int sourceHeight,
                          PImage target, int targetX, int targetY) {
-    if (pixels == null) {
+    if (bitmap != null) {
       bitmap.getPixels(target.pixels,
                        targetY*target.width + targetX, target.width,
                        sourceX, sourceY, sourceWidth, sourceHeight);
-    } else {
+    } else if (pixels != null) {
       int sourceIndex = sourceY*width + sourceX;
       int targetIndex = targetY*target.width + targetX;
       for (int row = 0; row < sourceHeight; row++) {
@@ -2863,4 +2873,4 @@ public boolean save(String path) {  // ignore
     }
     return success;
   }
-}
+}

core/src/processing/opengl/PGL.java

@@ -544,7 +544,7 @@ protected Texture wrapBackTexture(Texture texture) {
                    glColorTex.get(backTex), TEXTURE_2D, RGBA,
                    fboWidth, fboHeight, NEAREST, NEAREST,
                    CLAMP_TO_EDGE, CLAMP_TO_EDGE);
-      texture.invertedY(graphics.cameraUp);
+      texture.invertedY(!graphics.cameraUp);
       texture.colorBuffer(true);
       graphics.setCache(graphics, texture);
     } else {
@@ -561,7 +561,7 @@ protected Texture wrapFrontTexture(Texture texture)  {
                    glColorTex.get(frontTex), TEXTURE_2D, RGBA,
                    fboWidth, fboHeight, NEAREST, NEAREST,
                    CLAMP_TO_EDGE, CLAMP_TO_EDGE);
-      texture.invertedY(graphics.cameraUp);
+      texture.invertedY(!graphics.cameraUp);
       texture.colorBuffer(true);
     } else {
       texture.glName = glColorTex.get(frontTex);
@@ -3330,4 +3330,4 @@ public void bindFramebuffer(int target, int framebuffer) {
   public abstract void renderbufferStorageMultisample(int target, int samples, int format, int width, int height);
   public abstract void readBuffer(int buf);
   public abstract void drawBuffer(int buf);
-}
+}

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -6075,7 +6075,7 @@ protected void loadTextureImpl(int sampling, boolean mipmap) {
       Texture.Parameters params = new Texture.Parameters(ARGB,
                                                          sampling, mipmap);
       texture = new Texture(this, pixelWidth, pixelHeight, params);
-      texture.invertedY(cameraUp);
+      texture.invertedY(!cameraUp);
       texture.colorBuffer(true);
       setCache(this, texture);
     }
@@ -6086,7 +6086,7 @@ protected void createPTexture() {
     updatePixelSize();
     if (texture != null) {
       ptexture = new Texture(this, pixelWidth, pixelHeight, texture.getParameters());
-      ptexture.invertedY(cameraUp);
+      ptexture.invertedY(!cameraUp);
       ptexture.colorBuffer(true);
     }
   }
@@ -6226,7 +6226,7 @@ public void filter(PShader shader) {
     if (filterTexture == null || filterTexture.contextIsOutdated()) {
       filterTexture = new Texture(this, texture.width, texture.height,
                                   texture.getParameters());
-      filterTexture.invertedY(cameraUp);
+      filterTexture.invertedY(!cameraUp);
       filterImage = wrapTexture(filterTexture);
     }
     filterTexture.set(texture);
@@ -6296,7 +6296,7 @@ public void copy(int sx, int sy, int sw, int sh,
     loadTexture();
     if (filterTexture == null || filterTexture.contextIsOutdated()) {
       filterTexture = new Texture(this, texture.width, texture.height, texture.getParameters());
-      filterTexture.invertedY(cameraUp);
+      filterTexture.invertedY(!cameraUp);
       filterImage = wrapTexture(filterTexture);
     }
     filterTexture.put(texture, sx, height - (sy + sh), sw, height - sy);
@@ -6616,7 +6616,7 @@ protected Texture addTexture(PImage img, Texture.Parameters params) {
       img.parent = parent;
     }
     Texture tex = new Texture(this, img.pixelWidth, img.pixelHeight, params);
-    tex.invertedY(!cameraUp); // Pixels are read upside down
+    tex.invertedY(cameraUp); // Pixels are read upside down if camera us pointing up
     setCache(img, tex);
     return tex;
   }
@@ -13782,4 +13782,4 @@ static void rotateRight(int[] array, int i1, int i2) {
 
   }
 
-}
+}