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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/22 21:45:49

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

Log message:
        All tests pass

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/GLSpanner.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/GLSpanner.java
diff -u fenfire/org/fenfire/util/GLSpanner.java:1.6 
fenfire/org/fenfire/util/GLSpanner.java:1.7
--- fenfire/org/fenfire/util/GLSpanner.java:1.6 Tue Apr 22 15:44:54 2003
+++ fenfire/org/fenfire/util/GLSpanner.java     Tue Apr 22 21:45:49 2003
@@ -79,10 +79,13 @@
            pages = new SpanPage[sp.length()];
        }
        SpanPage getPage(int i) {
+           pa("getPage: "+i+" "+pages.length);
            if(i < 0 || i >= pages.length) return null;
            if(pages[i] == null) {
                pages[i] = new SpanPage(sb, i);
+               pa("created: "+i);
            }
+           pa("returning: "+pages[i]);
            return pages[i];
        }
     }
@@ -141,6 +144,7 @@
 
            try {
                path = MipzipCache.getPageFiles(sb)[page];
+               pa("Loading mipzip path: "+path);
 
                l = new MipzipLoader(new File(path));
            } catch(IOException e) {
@@ -149,8 +153,8 @@
                                path);
            }
            Dimension largest = l.getLevelSize(0);
-           x1 = d.width / (float)largest.width;
-           y1 = d.height / (float)largest.height;
+           x1 = l.origWidth;
+           y1 = l.origHeight;
            consumer = new MipzipMemoryConsumer(pool, l);
        }
     }
@@ -212,6 +216,7 @@
      * @param pixScale The number of pixels per imagespan unit: the resolution 
needed.
      */
     public static SpanRect getSpanRect(PageImageSpan sp) {
+       pa("getSpanRect: "+sp+" "+sp.getPageIndex());
        SpanRect r = (SpanRect)span2rect.get(sp);
        if(r == null) {
            PageImageScroll sb = (PageImageScroll)sp.getScrollBlock();