diff options
| author | Kenneth Russel <[email protected]> | 2007-04-19 06:35:44 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2007-04-19 06:35:44 +0000 |
| commit | 214aaf0bbe92d38a47611b4d72329373f91a89f3 (patch) | |
| tree | 003c30b65eb3e60135ede35f48b2a575bd7850c4 /src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java | |
| parent | a1ecc91851a3ea37a8c6e43c0395e678afa8acd1 (diff) | |
Fixed Issue 292: gluScaleImage does not scale correctly
Conversion scale factors for x and y dimensions were flipped.
Also adjusted Image.fill_image() so code does not assert.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1202 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java')
| -rw-r--r-- | src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java b/src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java index 3a007aa39..8154df353 100644 --- a/src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java +++ b/src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java @@ -72,8 +72,8 @@ public class ScaleInternal { HalveImage.halveImage( components, widthin, heightin, datain, dataout ); return; } - convx = (float)heightin / heightout; - convy = (float)widthin / widthout; + convy = (float)heightin / heightout; + convx = (float)widthin / widthout; halfconvx = convx / 2; halfconvy = convy / 2; for( i = 0; i < heightout; i++ ) { |