[ff-cvs] libvob org/nongnu/libvob/gl/GLUtil.java org/non...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/09/11 13:24:44

Modified files:
        org/nongnu/libvob/gl: GLUtil.java MipzipLoader.java 
        src/jni        : Main.cxx 
Removed files:
        org/nongnu/libvob/util: maps.test 

Log message:
        Lots of changes merged - see arch changelog

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/GLUtil.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/MipzipLoader.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Main.cxx.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/gl/GLUtil.java
diff -u libvob/org/nongnu/libvob/gl/GLUtil.java:1.1 
libvob/org/nongnu/libvob/gl/GLUtil.java:1.2
--- libvob/org/nongnu/libvob/gl/GLUtil.java:1.1 Wed Mar 26 13:13:25 2003
+++ libvob/org/nongnu/libvob/gl/GLUtil.java     Thu Sep 11 13:24:43 2003
@@ -74,13 +74,17 @@
                            "TEXTURE_INTERNAL_FORMAT")[0]);
            }
        }
-       if(texformat == null) return;
+       if(texformat == null) {
+           pa("TEXTURE RELOADCOMPRESSED NOFORMAT!");
+           return;
+       }
        GL.call("DeleteTextures "+tex.getTexId()+"\n");
        for(int i=start; i<end; i++) {
-           if(backup[i] != null)
-               tex.compressedTexImage(i,
-                   texformat, sizes[2*i], sizes[2*i+1], 0,
-                   backup[i]);
+           if(backup[i] == null)
+               throw new Error("Why is backup null!?!?");
+           tex.compressedTexImage(i,
+               texformat, sizes[2*i], sizes[2*i+1], 0,
+               backup[i]);
            backup[i] = null;
        }
        backup = null;
Index: libvob/org/nongnu/libvob/gl/MipzipLoader.java
diff -u libvob/org/nongnu/libvob/gl/MipzipLoader.java:1.7 
libvob/org/nongnu/libvob/gl/MipzipLoader.java:1.8
--- libvob/org/nongnu/libvob/gl/MipzipLoader.java:1.7   Thu Aug 28 19:56:56 2003
+++ libvob/org/nongnu/libvob/gl/MipzipLoader.java       Thu Sep 11 13:24:43 2003
@@ -208,8 +208,9 @@
                        4, 2, 0, "RGB", "FLOAT");
                */
            case STATE_DATALOADED:
-               loadedData = null;
+               break;
            }
+           loadedData = null;
            state = STATE_NONE;
        }
 
Index: libvob/src/jni/Main.cxx
diff -u libvob/src/jni/Main.cxx:1.22 libvob/src/jni/Main.cxx:1.23
--- libvob/src/jni/Main.cxx:1.22        Fri Aug 15 14:53:38 2003
+++ libvob/src/jni/Main.cxx     Thu Sep 11 13:24:44 2003
@@ -404,6 +404,7 @@
       setWindow();
       GLuint rel = id;
       glDeleteTextures(1, &rel);
+      GLERR
       releaseWindow();
 }