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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/22 08:09:05

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

Log message:
        Make compile again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/GLSpanner.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.3 
fenfire/org/fenfire/util/GLSpanner.java:1.4
--- fenfire/org/fenfire/util/GLSpanner.java:1.3 Tue Apr 22 07:49:10 2003
+++ fenfire/org/fenfire/util/GLSpanner.java     Tue Apr 22 08:09:05 2003
@@ -131,19 +131,18 @@
 
        SpanPage(PageImageScroll sb, int page) {
 
-           String file = sb.imageFilename(page);
-           float resmult = sb.imageFileResolution(page)  /
-                           sb.coordinateResolution() ;
-           // Get the size of the orig. image
-           Dimension d = ImageSize.readSize(new File(file));
-           if(d == null) {
-               pa("Image cannot be loaded: "+file);
-               throw new Error();
-           }
-           w = (int)(d.width / resmult);
-           h = (int)(d.height / resmult);
+           PageImageSpan sp = sb.getPage(page);
+           Dimension d = sp.getSize();
+           w = d.width;
+           h = d.height;
+
            MipzipLoader l; 
-           File f = new File(file + 
+
+           // XXX works only with Storm-Alph
+           org.nongnu.storm.BlockId id = 
+               (org.nongnu.storm.BlockId)sb.getBlockId(); 
+
+           File f = new File(id.getBitprint() + 
                    (GL.workaroundStupidBuggyAtiDrivers?
                        ".mipzipBLAH" :
                        ".mipzip"));