[Gzz-commits] fenfire/org/fenfire/spanimages/gl DefaultSpanIm...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/06/23 10:00:37

Modified files:
        org/fenfire/spanimages/gl: DefaultSpanImageFactory.java 
                                   PageScrollBlockImager.java 
                                   ScrollBlockImager.java 
                                   SingleImage.java 

Log message:
        Another step -- remember to actually *register* to listen to the 
events...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/ScrollBlockImager.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/SingleImage.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java
diff -u fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.3 
fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.4
--- fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.3  Mon Jun 
23 09:10:27 2003
+++ fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java      Mon Jun 
23 10:00:35 2003
@@ -63,7 +63,8 @@
 
        ImageSpan superImage = getSuperImageSpan(s);
 
-       SingleImage singleImage = scrollBlockImager.getSingleImage(s);
+       SingleImage singleImage = scrollBlockImager.getSingleImage(
+                                       s, poolManager);
 
        // x,y texcoords of (1,1) inside texture
        float x1 = singleImage.loader.origWidth;
Index: fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java
diff -u fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java:1.3 
fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java:1.4
--- fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java:1.3    Mon Jun 
23 08:30:42 2003
+++ fenfire/org/fenfire/spanimages/gl/PageScrollBlockImager.java        Mon Jun 
23 10:00:36 2003
@@ -64,7 +64,7 @@
        return m;
     }
 
-    public SingleImage getSingleImage(ImageSpan img) {
+    public SingleImage getSingleImage(ImageSpan img, PoolManager poolManager) {
        PageImageSpan span = (PageImageSpan)img;
        int page = span.getPageIndex();
 
@@ -80,7 +80,8 @@
                        sb.getID(),
                        page,
                        pageFiles[page],
-                       RESOLUTION
+                       RESOLUTION,
+                       poolManager
                        );
            } catch(Exception e) {
                throw new Error("Couldn't create singleimage!");
Index: fenfire/org/fenfire/spanimages/gl/ScrollBlockImager.java
diff -u fenfire/org/fenfire/spanimages/gl/ScrollBlockImager.java:1.3 
fenfire/org/fenfire/spanimages/gl/ScrollBlockImager.java:1.4
--- fenfire/org/fenfire/spanimages/gl/ScrollBlockImager.java:1.3        Mon Jun 
23 08:30:42 2003
+++ fenfire/org/fenfire/spanimages/gl/ScrollBlockImager.java    Mon Jun 23 
10:00:36 2003
@@ -55,6 +55,6 @@
        return res.toString();
     }
 
-    public abstract SingleImage getSingleImage(ImageSpan img) ;
+    public abstract SingleImage getSingleImage(ImageSpan img, PoolManager 
poolManager) ;
 
 }
Index: fenfire/org/fenfire/spanimages/gl/SingleImage.java
diff -u fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.4 
fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.5
--- fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.4      Mon Jun 23 
08:30:42 2003
+++ fenfire/org/fenfire/spanimages/gl/SingleImage.java  Mon Jun 23 10:00:36 2003
@@ -73,17 +73,23 @@
      *          For example, if a PS file was compiled into an image at
      *          160dpi, then this number is 160. Zero or negative = unknown,
      *          use pixel data.
+     * @param statsCallback The callback to give the TexAccum
      */
     public SingleImage(
                    String scrollBlock, int page,
                    String filename, 
-                       float resolution) throws java.io.IOException {
+                       float resolution,
+                       GL.StatsCallback statsCallback
+                       ) throws java.io.IOException {
        this.scrollBlock = scrollBlock;
        this.page = page;
        this.resolution = resolution;
 
        this.loader = new MipzipLoader(new File(filename));
-       this.accum = GL.createTexAccum();
+       if(statsCallback != null) 
+           this.accum = GL.createTexAccum(statsCallback, this);
+       else
+           this.accum = GL.createTexAccum();
 
        this.missingPixels = new double[this.loader.getNLevels()];
     }
@@ -97,6 +103,7 @@
            nnow += accum.get(i);
            missingPixels[missingPixels.length-1 - i] += nnow;
        }
+       if(dbg) p("SingleImage: readTexAccum - total: "+nnow);
        accum.clear();
     }
 
@@ -108,6 +115,7 @@
        double mul = Math.exp(- exponentialCoeff * msecs);
        for(int i=0; i<missingPixels.length; i++)
            missingPixels[i] *= mul;
+       if(dbg) p("SingleImage: updateTime- totalnow: "+nPixels());
     }
 
 }