*** empty log message ***

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1669 232f8b59-042b-4e1e-8c03-345bb8c30851

5 files changed, 10 insertions, 173 deletions

diff --git a/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java b/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java
index 835025b5c..01cdf4867 100755
--- a/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java
+++ b/src/classes/com/sun/opengl/util/texture/spi/DDSImage.java
@@ -44,7 +44,8 @@ import java.nio.*;
 import java.nio.channels.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import javax.media.opengl.util.*;
+import com.sun.opengl.util.texture.*;
 
 /** A reader and writer for DirectDraw Surface (.dds) files, which are
     used to describe textures. These files can contain multiple mipmap
diff --git a/src/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java b/src/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java
index edbb6e35e..8baa1f414 100755
--- a/src/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java
+++ b/src/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java
@@ -68,7 +68,7 @@ import java.io.IOException;
  * @author	Robin Luiten
  * @version	1.1	15/Dec/1997
  */
-class LEDataInputStream extends FilterInputStream implements DataInput
+public class LEDataInputStream extends FilterInputStream implements DataInput
 {
 	/**
 	 * To reuse	some of	the	non	endian dependent methods from
diff --git a/src/classes/com/sun/opengl/util/texture/spi/SGIImage.java b/src/classes/com/sun/opengl/util/texture/spi/SGIImage.java
index 12523eb18..5360dc01d 100755
--- a/src/classes/com/sun/opengl/util/texture/spi/SGIImage.java
+++ b/src/classes/com/sun/opengl/util/texture/spi/SGIImage.java
@@ -43,10 +43,6 @@ import java.io.*;
 import javax.media.opengl.*;
 import com.sun.opengl.util.*;
 
-// Test harness
-import java.awt.image.*;
-import javax.swing.*;
-
 /** <p> Reads and writes SGI RGB/RGBA images. </p>
 
     <p> Written from <a href =
@@ -637,6 +633,9 @@ public class SGIImage {
 
   // Test case
   /*
+    import java.awt.image.*;
+    import javax.swing.*;
+
   public static void main(String[] args) {
     for (int i = 0; i < args.length; i++) {
       try {
diff --git a/src/classes/com/sun/opengl/util/texture/spi/TGAImage.java b/src/classes/com/sun/opengl/util/texture/spi/TGAImage.java
index 8ab095643..e9e414891 100755
--- a/src/classes/com/sun/opengl/util/texture/spi/TGAImage.java
+++ b/src/classes/com/sun/opengl/util/texture/spi/TGAImage.java
@@ -44,6 +44,8 @@ import java.nio.*;
 import java.nio.channels.*;
 import javax.media.opengl.*;
 import com.sun.opengl.util.*;
+import com.sun.opengl.util.texture.spi.*;
+import com.sun.opengl.util.texture.*;
 
 /**
  * Targa image reader and writer adapted from sources of the <a href =
@@ -294,10 +296,10 @@ public class TGAImage {
     byte[] tmpData = new byte[rawWidth * header.height()];
 
     if (header.pixelDepth() == 24) {
-      format = GL.GL_BGR;
+      format = GL2.GL_BGR;
     } else {
       assert header.pixelDepth() == 32;
-      format = GL.GL_BGRA;
+      format = GL2.GL_BGRA;
     }
 
     for (i = 0; i < header.height(); ++i) {
diff --git a/src/classes/com/sun/opengl/util/texture/spi/TextureProvider.java b/src/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
deleted file mode 100755
index 1c822ef02..000000000
--- a/src/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- * Sun gratefully acknowledges that this software was originally authored
- * and developed by Kenneth Bradley Russell and Christopher John Kline.
- */
-
-package com.sun.opengl.util.texture.spi;
-
-import java.io.*;
-import java.net.*;
-
-import com.sun.opengl.util.texture.*;
-
-/** Plug-in interface to TextureIO to support reading OpenGL textures
-    from new file formats. For all methods, either internalFormat or
-    pixelFormat may be 0 in which case they must be inferred as
-    e.g. RGB or RGBA depending on the file contents.
-*/
-
-public interface TextureProvider {
-
-  /**
-   * Produces a TextureData object from a file, or returns null if the
-   * file format was not supported by this TextureProvider. Does not
-   * do any OpenGL-related work. The resulting TextureData can be
-   * converted into an OpenGL texture in a later step.
-   *
-   * @param file         the file from which to read the texture data
-   *
-   * @param internalFormat the OpenGL internal format to be used for
-   *                       the texture, or 0 if it should be inferred
-   *                       from the file's contents
-   *
-   * @param pixelFormat    the OpenGL pixel format to be used for
-   *                       the texture, or 0 if it should be inferred
-   *                       from the file's contents
-   *
-   * @param mipmap     whether mipmaps should be produced for this
-   *                   texture either by autogenerating them or
-   *                   reading them from the file. Some file formats
-   *                   support multiple mipmaps in a single file in
-   *                   which case those mipmaps will be used rather
-   *                   than generating them.
-   *
-   * @param fileSuffix     the file suffix to be used as a hint to the
-   *                       provider to more quickly decide whether it
-   *                       can handle the file, or null if the
-   *                       provider should infer the type from the
-   *                       file's contents
-   *
-   * @throws IOException if an error occurred while reading the file
-   */
-  public TextureData newTextureData(File file,
-                                    int internalFormat,
-                                    int pixelFormat,
-                                    boolean mipmap,
-                                    String fileSuffix) throws IOException;
-
-  /**
-   * Produces a TextureData object from a stream, or returns null if
-   * the file format was not supported by this TextureProvider. Does
-   * not do any OpenGL-related work. The resulting TextureData can be
-   * converted into an OpenGL texture in a later step.
-   *
-   * @param stream       the stream from which to read the texture data
-   *
-   * @param internalFormat the OpenGL internal format to be used for
-   *                       the texture, or 0 if it should be inferred
-   *                       from the file's contents
-   *
-   * @param pixelFormat    the OpenGL pixel format to be used for
-   *                       the texture, or 0 if it should be inferred
-   *                       from the file's contents
-   *
-   * @param mipmap     whether mipmaps should be produced for this
-   *                   texture either by autogenerating them or
-   *                   reading them from the file. Some file formats
-   *                   support multiple mipmaps in a single file in
-   *                   which case those mipmaps will be used rather
-   *                   than generating them.
-   *
-   * @param fileSuffix     the file suffix to be used as a hint to the
-   *                       provider to more quickly decide whether it
-   *                       can handle the file, or null if the
-   *                       provider should infer the type from the
-   *                       file's contents
-   *
-   * @throws IOException if an error occurred while reading the stream
-   */
-  public TextureData newTextureData(InputStream stream,
-                                    int internalFormat,
-                                    int pixelFormat,
-                                    boolean mipmap,
-                                    String fileSuffix) throws IOException;
-
-  /**
-   * Produces a TextureData object from a URL, or returns null if the
-   * file format was not supported by this TextureProvider. Does not
-   * do any OpenGL-related work. The resulting TextureData can be
-   * converted into an OpenGL texture in a later step.
-   *
-   * @param url          the URL from which to read the texture data
-   *
-   * @param internalFormat the OpenGL internal format to be used for
-   *                       the texture, or 0 if it should be inferred
-   *                       from the file's contents
-   *
-   * @param pixelFormat    the OpenGL pixel format to be used for
-   *                       the texture, or 0 if it should be inferred
-   *                       from the file's contents
-   *
-   * @param mipmap     whether mipmaps should be produced for this
-   *                   texture either by autogenerating them or
-   *                   reading them from the file. Some file formats
-   *                   support multiple mipmaps in a single file in
-   *                   which case those mipmaps will be used rather
-   *                   than generating them.
-   *
-   * @param fileSuffix     the file suffix to be used as a hint to the
-   *                       provider to more quickly decide whether it
-   *                       can handle the file, or null if the
-   *                       provider should infer the type from the
-   *                       file's contents
-   *
-   * @throws IOException if an error occurred while reading the URL
-   */
-  public TextureData newTextureData(URL url,
-                                    int internalFormat,
-                                    int pixelFormat,
-                                    boolean mipmap,
-                                    String fileSuffix) throws IOException;
-}