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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/22 07:49:10

Modified files:
        org/fenfire/util: GLSpanner.java pagespanpaper.test 
        org/fenfire/view: PageSpanLayout.java 

Log message:
        Get Fenfire to compile again with... now outdated alph :-)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/GLSpanner.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/GLSpanner.java
diff -u fenfire/org/fenfire/util/GLSpanner.java:1.2 
fenfire/org/fenfire/util/GLSpanner.java:1.3
--- fenfire/org/fenfire/util/GLSpanner.java:1.2 Tue Apr 22 07:27:53 2003
+++ fenfire/org/fenfire/util/GLSpanner.java     Tue Apr 22 07:49:10 2003
@@ -37,6 +37,7 @@
 import org.nongnu.libvob.gl.*;
 import org.nongnu.libvob.util.ImageSize;
 import org.nongnu.alph.PageSpan;
+import org.nongnu.alph.PageImageSpan;
 import org.nongnu.alph.impl.PageImageScroll;
 
 /** A static class for loading Image spans into OpenGL 
@@ -188,7 +189,7 @@
            return tex;
        }
 
-       private SpanRect(SpanPage page, PageSpan sp) {
+       private SpanRect(SpanPage page, PageImageSpan sp) {
            this.page = page;
            Point p =sp.getLocation();
            Dimension s =sp.getSize();
@@ -216,7 +217,7 @@
      *                         1 = at focus, 0 = very peripheral
      * @param pixScale The number of pixels per imagespan unit: the resolution 
needed.
      */
-    public static SpanRect getSpanRect(PageSpan sp) {
+    public static SpanRect getSpanRect(PageImageSpan sp) {
        SpanRect r = (SpanRect)span2rect.get(sp);
        if(r == null) {
            PageImageScroll sb = (PageImageScroll)sp.getScrollBlock();
@@ -228,7 +229,7 @@
                sb2spansb.put(sb, ssb);
            }
 
-           SpanPage p = ssb.getPage(sp.offset());
+           SpanPage p = ssb.getPage(sp.getPageIndex());
 
            r = new SpanRect(p, sp);
 
Index: fenfire/org/fenfire/util/pagespanpaper.test
diff -u fenfire/org/fenfire/util/pagespanpaper.test:1.11 
fenfire/org/fenfire/util/pagespanpaper.test:1.12
--- fenfire/org/fenfire/util/pagespanpaper.test:1.11    Tue Apr 15 07:51:08 2003
+++ fenfire/org/fenfire/util/pagespanpaper.test Tue Apr 22 07:49:10 2003
@@ -25,6 +25,7 @@
 import sys
 import traceback
 
+import org
 from org import fenfire
 fenfire.test.gfx.needGL()
 
@@ -58,14 +59,15 @@
 fenfire.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
 fenfire.util.PageSpanPaper.paperMillWindow = fenfire.test.gfx.win
 
-# /tmp/gzztest.pdf -- 
urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq
+# alph/testdata/test1.pdf -- 
urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq
 
 def setUp():
     global sc
 
-    id = 
"urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq"
-    sc = alph.impl.PageImageScroll(None, storm.BlockId(id))
-    print sc.getID()
+    pool = org.nongnu.storm.impl.TransientPool(java.util.HashSet())
+    myalph = alph.impl.StormAlph(pool)
+    sc = myalph.addFile(java.io.File('../alph/testdata/test1.pdf'), 
'application/pdf')
+    assert sc.getBlockId().getURI() == 
"urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq"
 
 def testTestSpan():
     """Test that we really have the pagespan images.
Index: fenfire/org/fenfire/view/PageSpanLayout.java
diff -u fenfire/org/fenfire/view/PageSpanLayout.java:1.3 
fenfire/org/fenfire/view/PageSpanLayout.java:1.4
--- fenfire/org/fenfire/view/PageSpanLayout.java:1.3    Wed Apr  2 03:47:09 2003
+++ fenfire/org/fenfire/view/PageSpanLayout.java        Tue Apr 22 07:49:10 2003
@@ -24,10 +24,10 @@
     public static int  flags = 2;
 
     public interface PageSpanPaperMaker {
-       PageSpanPaper getPaper(GLSpanner.SpanPage p, PageSpan sp);
+       PageSpanPaper getPaper(GLSpanner.SpanPage p, PageImageSpan sp);
     }
     public static class DefaultPageSpanPaperMaker implements 
PageSpanPaperMaker {
-       public PageSpanPaper getPaper(GLSpanner.SpanPage p, PageSpan sp) {
+       public PageSpanPaper getPaper(GLSpanner.SpanPage p, PageImageSpan sp) {
            return new PageSpanPaper(p, sp.getScrollBlock().hashCode());
        }
     }
@@ -37,7 +37,7 @@
     public boolean useText = true;
 
     private int npages;
-    private PageSpan[] pages;
+    private PageImageSpan[] pages;
     private PageSpanPaper[] psps;
     private float[] xywh;
 
@@ -48,7 +48,7 @@
      */
     private void alloc(int size) {
        npages = size;
-       pages = new PageSpan[npages];
+       pages = new PageImageSpan[npages];
        psps = new PageSpanPaper[npages];
        xywh = new float[npages * 4]; // x, y, w, h in PAPER coordinates
        w = 0;
@@ -57,7 +57,7 @@
 
     /** (To be called with increasing p): add a page.
      */
-    private void page(int p, PageSpan sp, PageSpanPaperMaker 
pageSpanPaperMaker) {
+    private void page(int p, PageImageSpan sp, PageSpanPaperMaker 
pageSpanPaperMaker) {
        pages[p] = sp; 
        GLSpanner.SpanRect rect = GLSpanner.getSpanRect(pages[p]);
        psps[p] = pageSpanPaperMaker.getPaper(rect.page, sp);
@@ -90,7 +90,10 @@
 
        for(int p = 0; p < npages; p++) {
            // XXX INEFFICIENT!
-           page(p, (PageSpan)enf.sub(p, p+1).getList().get(0), maker); 
+           Object span = enf.sub(p, p+1).getList().get(0);
+           if(span instanceof PageSpan)
+               span = ((PageSpan)span).getPage(0);
+           page(p, (PageImageSpan)span, maker); 
        }
 
     }
@@ -103,7 +106,7 @@
        alloc(sp.length());
 
        for(int p = 0; p < npages; p++) {
-           page(p, (PageSpan)sp.subSpan(p, p+1), maker);
+           page(p, sp.getPage(p), maker);
        }
 
     }
@@ -114,7 +117,7 @@
      * Currently, only the first intersecting page
      * is used, but this may change.
      */
-    public float[] getExtents(PageSpan s, float[] xywh_out) {
+    public float[] getExtents(PageImageSpan s, float[] xywh_out) {
        if(xywh_out == null) xywh_out = new float[4];
 
        float curw = 0;