From 07684c8fe9534c235d0320ad693be24a8bdcada1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 19 Oct 2009 00:41:09 -0700 Subject: imageSizeInBytes .. leaving out the dirt/padding last line --- make/config/jogl/gl-impl-CustomJavaCode-desktop.java | 11 ++++------- make/config/jogl/gl-impl-CustomJavaCode-embedded.java | 8 +++++--- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'make') 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 } + -- cgit v1.2.3