From c4ed57f617117e3e38319f1a44a0d066f1a332b3 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 19 Aug 2015 05:55:09 +0200
Subject: 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.
---
 make/scripts/tests.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'make/scripts')

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index d19631f02..844bbde5f 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -182,7 +182,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.GLContext.TraceSwitch -Djogl.debug=all"
     #D_ARGS="-Djogl.debug.GLArrayData"
     #D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.Window"
-    D_ARGS="-Dnewt.debug.Window"
+    #D_ARGS="-Dnewt.debug.Window"
     #D_ARGS="-Dnewt.debug.Screen"
     #D_ARGS="-Dnewt.test.Screen.disableRandR13"
     #D_ARGS="-Dnewt.test.Screen.disableScreenMode -Dnewt.debug.Screen"
@@ -281,6 +281,7 @@ function jrun() {
     #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogamp.debug.IOUtil"
     #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
     #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogamp.gluegen.UseTempJarCache=false"
+    #D_ARGS="-Djogamp.debug.JNILibLoader.Perf"
     #D_ARGS="-Dnewt.test.EDTMainThread -Dnewt.debug.MainThread"
     #C_ARG="com.jogamp.newt.util.MainThread"
     #D_ARGS="-Dnewt.debug.MainThread"
@@ -420,7 +421,7 @@ function testawtswt() {
 #
 # HiDPI
 #
-testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2SimpleNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $*
@@ -812,6 +813,8 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTexture01AWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTexture02AWT $*
 
+#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestImageTypeNEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTextureIONEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestJPEGImage01NEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestJPEGJoglAWTCompareNewtAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestJPEGJoglAWTBenchmarkNewtAWT $*
-- 
cgit v1.2.3