Bug 1042: ImageIOUtil -> ImageType + ImageType.Util ; Fix implementation and test.

- ImageIOUtil -> ImageType + ImageType.Util

- ImageType.Util.getFileSuffix(..):
  - Fix byte type conversion, i.e. 'b == (byte)0x89',
    cast is required to avoid byte -> int conversion.
    Note: signed byte -128 - +128

  - Parse in O(1), i.e. lexicographical parsing

  - FIXME: We seem to have at least three type collisions, validate!

- ImageType:
  - Complete T_* w/ API doc -> FIXME/TODO missing type references!
  - ImageType instancing via InputStream or manual type definition.

- TextureData
  - Contains optional source ImageType

- TextureProvider:
  - Deprecate newTextureData(..) variants other than InputStream
    simplifying TextureIO.

- TextureProvider.SupportsImageTypes:
  - Added interface, allowing mapping ImageType -> provider

- Tested standalone ImageType (TestImageTypeNEWT) and
  via TextureIO (TestTextureIONEWT) utilizing list of all
  test data (ImageTstFiles), i.e. PNG, JPG, TGA and DDS.

3 files changed, 385 insertions, 0 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/ImageTstFiles.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/ImageTstFiles.java
new file mode 100644
index 000000000..dfd3f6366
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/ImageTstFiles.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright 2014 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package com.jogamp.opengl.test.junit.jogl.util.texture;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+import java.util.ArrayList;
+
+import com.jogamp.common.util.IOUtil;
+
+public class ImageTstFiles {
+    public static final String[] pngFileNames = new String[] {
+            "bug724-transparent-grey_gimpexp.png",
+            "bug724-transparent-grey_orig.png",
+            "cross-grey-alpha-16x16.png",
+            "grayscale_texture.png",
+            "pointer-grey-alpha-16x24.png",
+            "test-ntscI_3-01-160x90.png",
+            "test-ntscI_4-01-160x90.png",
+            "test-ntscIG3-01-160x90.png",
+            "test-ntscIG4-01-160x90.png",
+            "test-ntscN_3-01-160x90.png",
+            "test-ntscN_4-01-160x90.png",
+            "test-ntscNG4-01-160x90.png",
+            "test-ntscP_3-01-160x90.png",
+            "test-ntscP_4-01-160x90.png"
+            };
+
+    public static final String[] jpgFileNames = new String[] {
+            "bug745_qttdef_post_frame.jpg",
+            "darwin_03_N_4-YCCK-640x452.jpg", // local
+            "darwin_03_N_4-YCCK.jpg",         // local
+            "j1-baseline.jpg",
+            "j2-progressive.jpg",
+            "j3-baseline_gray.jpg",
+            "test-cmyk-01.jpg",
+            "test-ntscN_3-01-160x90-60pct-yuv422h-base.jpg",
+            "test-ntscN_3-01-160x90-60pct-yuv422h-prog.jpg",
+            "test-ntscN_3-01-160x90-90pct-yuv444-base.jpg",
+            "test-ntscN_3-01-160x90-90pct-yuv444-prog.jpg",
+            "test-ycck-01.jpg" };
+
+    public static final String[] tgaFileNames = new String[] {
+            "bug744-rle32.tga",
+            "bug982.rle32.256x256.tga",
+            "test-u32.tga"
+    };
+    public static final String[] ddsFileNames = new String[] {
+            "test-64x32_DXT1.dds",
+            "test-64x32_DXT5.dds",
+            "test-64x32_uncompressed.dds"
+    };
+
+    public static class NamedInputStream {
+        final String fullPath;
+        final String basePath;
+        final InputStream stream;
+        public NamedInputStream(final String fullPath, final String basePath, final InputStream stream) {
+            this.fullPath = fullPath;
+            this.basePath = basePath;
+            this.stream = stream;
+        }
+    }
+    public ArrayList<NamedInputStream> pngStreams;
+    public ArrayList<NamedInputStream> jpgStreams;
+    public ArrayList<NamedInputStream> tgaStreams;
+    public ArrayList<NamedInputStream> ddsStreams;
+    public ArrayList<NamedInputStream> allStreams;
+
+    private final ArrayList<NamedInputStream> init(final String[] source) throws IOException {
+        final ArrayList<NamedInputStream> sink = new ArrayList<NamedInputStream>();
+        for(int i=0; i<source.length; i++) {
+            final URLConnection testTextureUrlConn = IOUtil.getResource(this.getClass(), source[i]);
+            if( null != testTextureUrlConn ) {
+                final InputStream s = testTextureUrlConn.getInputStream();
+                if( null != s ) {
+                    sink.add(new NamedInputStream(testTextureUrlConn.getURL().toString(), source[i], s));
+                }
+            }
+        }
+        return sink;
+    }
+
+    public void init() throws IOException {
+        pngStreams = init(pngFileNames);
+        jpgStreams = init(jpgFileNames);
+        tgaStreams = init(tgaFileNames);
+        ddsStreams = init(ddsFileNames);
+        allStreams = new ArrayList<NamedInputStream>();
+        allStreams.addAll(pngStreams);
+        allStreams.addAll(jpgStreams);
+        allStreams.addAll(tgaStreams);
+        allStreams.addAll(ddsStreams);
+    }
+    public void clear() {
+        pngStreams.clear();
+        jpgStreams.clear();
+        tgaStreams.clear();
+        ddsStreams.clear();
+        allStreams.clear();
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestImageTypeNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestImageTypeNEWT.java
new file mode 100644
index 000000000..952d54443
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestImageTypeNEWT.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright 2015 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package com.jogamp.opengl.test.junit.jogl.util.texture;
+
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.texture.ImageType;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestImageTypeNEWT extends UITestCase {
+    ImageTstFiles imageTstFiles;
+
+    @Before
+    public void initTest() throws IOException {
+        imageTstFiles = new ImageTstFiles();
+        imageTstFiles.init();
+    }
+
+    @After
+    public void cleanupTest() {
+        imageTstFiles.clear();
+    }
+
+    public void testImpl(final List<ImageTstFiles.NamedInputStream> streams, final ImageType expImageType) throws InterruptedException, IOException {
+        for(int i=0; i<streams.size(); i++) {
+            final ImageTstFiles.NamedInputStream s = streams.get(i);
+            final ImageType t = new ImageType(s.stream);
+            System.err.printf("Test %3d: path %s, exp-type %s, has-type %s%n", i, s.basePath, expImageType, t);
+            Assert.assertEquals(expImageType, t);
+        }
+    }
+
+    @Test
+    public void test01AllPNG() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.pngStreams, new ImageType(ImageType.T_PNG));
+    }
+
+    @Test
+    public void test02AllJPG() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.jpgStreams, new ImageType(ImageType.T_JPG));
+    }
+
+    // TGA cannot be detected
+    // @Test
+    public void test03AllTGA() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.tgaStreams, new ImageType(ImageType.T_TGA));
+    }
+
+    @Test
+    public void test04AllDDS() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.ddsStreams, new ImageType(ImageType.T_DDS));
+    }
+
+    public static void main(final String args[]) throws IOException {
+        org.junit.runner.JUnitCore.main(TestImageTypeNEWT.class.getName());
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java
new file mode 100644
index 000000000..c5c32280d
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java
@@ -0,0 +1,165 @@
+/**
+ * Copyright 2015 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package com.jogamp.opengl.test.junit.jogl.util.texture;
+
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.test.junit.jogl.demos.TextureDraw01Accessor;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.TextureDraw01ES2Listener;
+import com.jogamp.opengl.test.junit.jogl.demos.gl2.TextureDraw01GL2Listener;
+import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.QuitAdapter;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.texture.ImageType;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+
+import junit.framework.Assert;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestTextureIONEWT extends UITestCase {
+    static long duration = 100; // ms
+
+    ImageTstFiles imageTstFiles;
+
+    @Before
+    public void initTest() throws IOException {
+        imageTstFiles = new ImageTstFiles();
+        imageTstFiles.init();
+    }
+
+    @After
+    public void cleanupTest() {
+        imageTstFiles.clear();
+    }
+
+    public void testImpl(final List<ImageTstFiles.NamedInputStream> streams, final ImageType expImageType) throws InterruptedException, IOException {
+        for(int i=0; i<streams.size(); i++) {
+            final ImageTstFiles.NamedInputStream s = streams.get(i);
+            System.err.printf("Test %3d: path %s, exp-type %s%n", i, s.basePath, expImageType);
+            testImpl(s.stream, expImageType);
+        }
+    }
+    public void testImpl(final InputStream istream, final ImageType expImageType) throws InterruptedException, IOException {
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
+        final GLProfile glp = GLProfile.isAvailable(GLProfile.GL2ES2) ? GLProfile.getGL2ES2() : GLProfile.getDefault();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        caps.setAlphaBits(1);
+
+        final TextureData texData = TextureIO.newTextureData(glp, istream, false /* mipmap */, expImageType.type);
+        System.err.println("TextureData: "+texData);
+        Assert.assertEquals(expImageType, texData.getSourceImageType());
+
+        final GLWindow glad = GLWindow.create(caps);
+        glad.setTitle("TestTextureIONEWT."+expImageType.type);
+        // Size OpenGL to Video Surface
+        glad.setSize(texData.getWidth(), texData.getHeight());
+
+        // load texture from file inside current GL context to match the way
+        // the bug submitter was doing it
+        final GLEventListener gle = glp.isGL2ES2() ? new TextureDraw01ES2Listener( texData, 0 ) : new TextureDraw01GL2Listener( texData ) ;
+        glad.addGLEventListener(gle);
+        glad.addGLEventListener(new GLEventListener() {
+            boolean shot = false;
+
+            @Override public void init(final GLAutoDrawable drawable) {}
+
+            public void display(final GLAutoDrawable drawable) {
+                // 1 snapshot
+                if(null!=((TextureDraw01Accessor)gle).getTexture() && !shot) {
+                    shot = true;
+                    snapshot(0, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
+                }
+            }
+
+            @Override public void dispose(final GLAutoDrawable drawable) { }
+            @Override public void reshape(final GLAutoDrawable drawable, final int x, final int y, final int width, final int height) { }
+        });
+
+        final Animator animator = new Animator(glad);
+        animator.setUpdateFPSFrames(60, null);
+        final QuitAdapter quitAdapter = new QuitAdapter();
+        glad.addKeyListener(quitAdapter);
+        glad.addWindowListener(quitAdapter);
+        glad.setVisible(true);
+        animator.start();
+
+        while(!quitAdapter.shouldQuit() && animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+            Thread.sleep(100);
+        }
+
+        animator.stop();
+        glad.destroy();
+    }
+
+    @Test
+    public void test01AllPNG() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.pngStreams, new ImageType(ImageType.T_PNG));
+    }
+
+    @Test
+    public void test02AllJPG() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.jpgStreams, new ImageType(ImageType.T_JPG));
+    }
+
+    @Test
+    public void test03AllTGA() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.tgaStreams, new ImageType(ImageType.T_TGA));
+    }
+
+    @Test
+    public void test04AllDDS() throws InterruptedException, IOException {
+        testImpl(imageTstFiles.ddsStreams, new ImageType(ImageType.T_DDS));
+    }
+
+    public static void main(final String args[]) throws IOException {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-time")) {
+                i++;
+                duration = MiscUtils.atol(args[i], duration);
+            }
+        }
+        org.junit.runner.JUnitCore.main(TestTextureIONEWT.class.getName());
+    }
+}