[Gzz-commits] fenfire/org/fenfire/util GLSpanner.java MipzipC...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/22 15:40:35

Modified files:
        org/fenfire/util: GLSpanner.java MipzipCache.java 

Log message:
        USE Mipzip generation on the fly, untested

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/GLSpanner.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/MipzipCache.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/GLSpanner.java
diff -u fenfire/org/fenfire/util/GLSpanner.java:1.4 
fenfire/org/fenfire/util/GLSpanner.java:1.5
--- fenfire/org/fenfire/util/GLSpanner.java:1.4 Tue Apr 22 08:09:05 2003
+++ fenfire/org/fenfire/util/GLSpanner.java     Tue Apr 22 15:40:35 2003
@@ -138,16 +138,10 @@
 
            MipzipLoader l; 
 
-           // XXX works only with Storm-Alph
-           org.nongnu.storm.BlockId id = 
-               (org.nongnu.storm.BlockId)sb.getBlockId(); 
+           String path = MipzipCache.getPageFiles(sb)[page];
 
-           File f = new File(id.getBitprint() + 
-                   (GL.workaroundStupidBuggyAtiDrivers?
-                       ".mipzipBLAH" :
-                       ".mipzip"));
            try {
-               l = new MipzipLoader(f);
+               l = new MipzipLoader(new File(path));
            } catch(IOException e) {
                e.printStackTrace();
                throw new Error("MipzipLoader threw '" + e + "' for " + 
Index: fenfire/org/fenfire/util/MipzipCache.java
diff -u fenfire/org/fenfire/util/MipzipCache.java:1.1 
fenfire/org/fenfire/util/MipzipCache.java:1.2
--- fenfire/org/fenfire/util/MipzipCache.java:1.1       Tue Apr 22 15:38:17 2003
+++ fenfire/org/fenfire/util/MipzipCache.java   Tue Apr 22 15:40:35 2003
@@ -55,7 +55,7 @@
        return res.toString();
     }
 
-    public String[] getPageFile(ScrollBlock pages) {
+    public String[] getPageFiles(ScrollBlock pages) {
        String ct = pages.getContentType();
        if(! (ct.equals("application/pdf") ||
              ct.equals("application/postscript")))