diff options
| author | Sven Gothel <[email protected]> | 2008-09-02 04:06:42 +0000 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2008-09-02 04:06:42 +0000 |
| commit | c7e5336fe362e721fdafdf55e1304b63b33026fc (patch) | |
| tree | e118787934c280a0da983f2c3d9dbfd918ca0bc9 /src/classes/com/sun/opengl/util/texture | |
| parent | 56739eb41c21287c4a3c2484c54a18065d404c8f (diff) | |
Fix: TextureIO.java* DDSImage.java* (Relocation of io utils)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1767 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes/com/sun/opengl/util/texture')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp index 72e07b4bb..c6b6271da 100755 --- a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp +++ b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp @@ -47,7 +47,7 @@ import java.util.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; import com.sun.opengl.impl.Debug; -import com.sun.opengl.util.io.*; +import com.sun.opengl.impl.io.*; import com.sun.opengl.util.texture.spi.*; /** <P> Provides input and output facilities for both loading OpenGL diff --git a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase index f1a957100..d9ae5b6c4 100755 --- a/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase +++ b/src/classes/com/sun/opengl/util/texture/TextureIO.java.javase @@ -47,7 +47,7 @@ import java.util.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; import com.sun.opengl.impl.Debug; -import com.sun.opengl.util.io.*; +import com.sun.opengl.impl.io.*; import com.sun.opengl.util.texture.spi.*; /** <P> Provides input and output facilities for both loading OpenGL diff --git a/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp index de776a2e1..eadae84f8 100755 --- a/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp +++ b/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp @@ -44,7 +44,7 @@ import java.nio.*; import javax.media.opengl.*; import javax.media.opengl.util.*; -import com.sun.opengl.util.io.*; +import com.sun.opengl.impl.io.*; import com.sun.opengl.util.texture.*; /** A reader and writer for DirectDraw Surface (.dds) files, which are @@ -699,7 +699,7 @@ public class DDSImage { header = new Header(); header.read(leInput); fixupHeader(); - buf = ByteBuffer.wrap(StreamUtil.readAll(input)); + buf = StreamUtil.readAll2Buffer(input); } private void initFromData(int d3dFormat, |