From 4b8fb75b9bf3524fcc09a42b0a4ba07596273cd2 Mon Sep 17 00:00:00 2001
From: Egor Tsinko <etsinko@gmail.com>
Date: Fri, 14 Feb 2020 10:59:48 -0700
Subject: fixed invalid canvas size passed to readRaster() pipeline operation

---
 src/main/java/org/jogamp/java3d/GraphicsContext3D.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/jogamp/java3d/GraphicsContext3D.java b/src/main/java/org/jogamp/java3d/GraphicsContext3D.java
index c2c43f9..6844b95 100644
--- a/src/main/java/org/jogamp/java3d/GraphicsContext3D.java
+++ b/src/main/java/org/jogamp/java3d/GraphicsContext3D.java
@@ -2255,7 +2255,6 @@ public int numSounds() {
         }
 
         RasterRetained ras = (RasterRetained)raster.retained;
-        Dimension canvasSize = canvas3d.getSize();
         Dimension rasterSize = new Dimension();
         ImageComponent2DRetained image = ras.image;
 
@@ -2348,7 +2347,7 @@ public int numSounds() {
 
                 Pipeline.getPipeline().readRaster(canvas3d.ctx,
                         ras.type, rasterSrcOffset.x, rasterSrcOffset.y,
-                        rasterSize.width, rasterSize.height, canvasSize.height,
+                        rasterSize.width, rasterSize.height, canvas3d.getPixelHeight(),
                         imageDataType,
                         imageFormatType,
                         imageBuffer,
-- 
cgit v1.2.3


From c6d5c540f605735c4e121d6cc245572baca0101f Mon Sep 17 00:00:00 2001
From: Egor Tsinko <etsinko@gmail.com>
Date: Fri, 14 Feb 2020 11:00:18 -0700
Subject: made Canvas3D.getPixelHeight() and Canvas3D.getPixelWidth() public

---
 src/main/java/org/jogamp/java3d/Canvas3D.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jogamp/java3d/Canvas3D.java b/src/main/java/org/jogamp/java3d/Canvas3D.java
index 55dbab9..9188ae0 100644
--- a/src/main/java/org/jogamp/java3d/Canvas3D.java
+++ b/src/main/java/org/jogamp/java3d/Canvas3D.java
@@ -2848,7 +2848,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
     /**
      * Retreives the width of the canvas in device pixels (regardless of HIDPI scale)
      */
-    int getPixelWidth() {
+    public int getPixelWidth() {
         if (canvasViewCache != null) {
             synchronized (canvasViewCache) {
                 return canvasViewCache.getCanvasWidth();
@@ -2860,7 +2860,7 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
     /**
      * Retreives the height of the canvas in device pixels (regardless of HIDPI scale)
      */
-    int getPixelHeight() {
+    public int getPixelHeight() {
         if (canvasViewCache != null) {
             synchronized (canvasViewCache) {
                 return canvasViewCache.getCanvasHeight();
-- 
cgit v1.2.3