diff options
| author | Kenneth Russel <[email protected]> | 2005-10-24 19:21:28 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2005-10-24 19:21:28 +0000 |
| commit | 6873f65775af236ed270fcbd08661f5b53ba3598 (patch) | |
| tree | 6fcefdc3a9429d7d3071b1464c11d40fa7bc3ab9 /src/demos/util/TGAImage.java | |
| parent | 538be101e7bce7788c82e1b254a66deb5d35bb56 (diff) | |
Merged JSR-231 branch on to the main JOGL trunk. The main trunk now
contains the evolving JSR-231 Reference Implementation and the JSR-231
branch is permanently closed.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@144 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src/demos/util/TGAImage.java')
| -rw-r--r-- | src/demos/util/TGAImage.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/demos/util/TGAImage.java b/src/demos/util/TGAImage.java index 24403eb..a99f4f3 100644 --- a/src/demos/util/TGAImage.java +++ b/src/demos/util/TGAImage.java @@ -40,7 +40,8 @@ package demos.util; import java.io.*; -import net.java.games.jogl.*; +import javax.media.opengl.*; +import com.sun.opengl.utils.*; /** * Targa image reader adapted from sources of the <a href = @@ -271,10 +272,10 @@ public class TGAImage { data = new byte[rawWidth * header.height()]; if (header.pixelDepth() == 24) { - format = GL.GL_BGR_EXT; + format = GL.GL_BGR; } else { assert header.pixelDepth() == 32; - format = GL.GL_BGRA_EXT; + format = GL.GL_BGRA; } for (i = 0; i < header.height(); ++i) { @@ -295,7 +296,7 @@ public class TGAImage { /** Returns the height of the image. */ public int getHeight() { return header.height(); } - /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR_EXT or GL.GL_BGRA_EXT. */ + /** Returns the OpenGL format for this texture; e.g. GL.GL_BGR or GL.GL_BGRA. */ public int getGLFormat() { return format; } /** Returns the raw data for this texture in the correct |