summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-desktop.java11
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-embedded.java8
2 files changed, 9 insertions, 10 deletions
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-desktop.java b/make/config/jogl/gl-impl-CustomJavaCode-desktop.java
index fb06aa4ae..04ba39c3d 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-desktop.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-desktop.java
@@ -71,12 +71,9 @@ private int imageSizeInBytes(int bytesPerElement,
* rowlenght is the actual repeating offset
* to go from line n to line n+1 at the same x-axis position.
*/
- int imageSize = imageHeight * rowLengthInBytes;
-
- int skipOffset = skipImages * imageSize +
- skipRows * rowLengthInBytes +
- skipPixels * bytesPerElement;
-
- return skipOffset + imageSize * depth;
+ return
+ ( skipImages + depth - 1 ) * imageHeight * rowLengthInBytes + // whole images
+ ( skipRows + height - 1 ) * rowLengthInBytes + // lines with padding
+ ( skipPixels + width ) * bytesPerElement; // last line
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-embedded.java b/make/config/jogl/gl-impl-CustomJavaCode-embedded.java
index ae90a42a0..0408c21a1 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-embedded.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-embedded.java
@@ -34,7 +34,9 @@ private int imageSizeInBytes(int bytesPerElement,
* rowlenght is the actual repeating offset
* to go from line n to line n+1 at the same x-axis position.
*/
- int imageSize = imageHeight * rowLengthInBytes;
-
- return imageSize * depth;
+ return
+ ( depth - 1 ) * imageHeight * rowLengthInBytes + // whole images
+ ( imageHeight - 1 ) * rowLengthInBytes + // lines with padding
+ ( rowLength ) * bytesPerElement; // last line
}
+