From 94f3c1b5d3af65cf9d985833b2c8e40ec1af4592 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 21 Nov 2013 01:42:54 +0100
Subject: Bug 909 - Reccreate GLJPanel's BufferedImage is no more sourced by
 singleton AWTGLPixelBuffer

GLJPanel must validate whether it's local BufferedImage's DataBuffer is sourced
by the current singleton AWTGLPixelBuffer.

Case:
GLJPanel-B has created a new singleton AWTGLPixelBuffer w/ increased size.
Previous created GLJPanel-A's local BufferedImage's DataBuffer is no more sourced
by the singleton AWTGLPixelBuffer and hence must be re-created.
---
 .../jogamp/opengl/util/awt/AWTGLPixelBuffer.java   | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'src/jogl/classes/com/jogamp')

diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLPixelBuffer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLPixelBuffer.java
index 77b14b424..a33356067 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLPixelBuffer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/AWTGLPixelBuffer.java
@@ -101,20 +101,24 @@ public class AWTGLPixelBuffer extends GLPixelBuffer {
         if( width * height > image.getWidth() * image.getHeight() ) {
             throw new IllegalArgumentException("Requested size exceeds image size: "+width+"x"+height+" > "+image.getWidth()+"x"+image.getHeight());
         }
-        if( width == image.getWidth() ) {
-            if( height == image.getHeight() ) {
-                return image;
-            }
-            return image.getSubimage(0, 0, width, height);
+        if( width == image.getWidth() && height == image.getHeight() ) {
+            return image;
+        } else {
+            final ColorModel cm = image.getColorModel();
+            final WritableRaster raster0 = image.getRaster();
+            final DataBuffer dataBuffer = raster0.getDataBuffer();
+            final SinglePixelPackedSampleModel sppsm0 = (SinglePixelPackedSampleModel) raster0.getSampleModel();
+            final SinglePixelPackedSampleModel sppsm1 = new SinglePixelPackedSampleModel(dataBuffer.getDataType(),
+                        width, height, width /* scanLineStride */, sppsm0.getBitMasks());
+            final WritableRaster raster1 = WritableRaster.createWritableRaster(sppsm1, dataBuffer, null);
+            return new BufferedImage (cm, raster1, cm.isAlphaPremultiplied(), null);
         }
-        final ColorModel cm = image.getColorModel();
-        final WritableRaster raster = image.getRaster();
-        final DataBuffer dataBuffer = raster.getDataBuffer();
-        final SinglePixelPackedSampleModel sppsm0 = (SinglePixelPackedSampleModel) raster.getSampleModel();
-        final SinglePixelPackedSampleModel sppsm1 = new SinglePixelPackedSampleModel(dataBuffer.getDataType(),
-                    width, height, width /* scanLineStride */, sppsm0.getBitMasks());
-        final WritableRaster raster1 = WritableRaster.createWritableRaster(sppsm1, dataBuffer, null);
-        return new BufferedImage (cm, raster1, cm.isAlphaPremultiplied(), null);
+    }
+
+    public final boolean isDataBufferSource(BufferedImage imageU) {
+        final DataBuffer dataBuffer0 = image.getRaster().getDataBuffer();
+        final DataBuffer dataBufferU = imageU.getRaster().getDataBuffer();
+        return dataBufferU == dataBuffer0;
     }
 
     @Override
-- 
cgit v1.2.3