[ff-cvs] fenfire/org/fenfire fenpdf/appearance/papers.py...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/10/06 04:52:24

Modified files:
        org/fenfire/fenpdf/appearance: papers.py 
        org/fenfire/spanimages/gl: DefaultSpanImageFactory.java 

Log message:
        Arch sync

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/papers.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/appearance/papers.py
diff -u fenfire/org/fenfire/fenpdf/appearance/papers.py:1.11 
fenfire/org/fenfire/fenpdf/appearance/papers.py:1.12
--- fenfire/org/fenfire/fenpdf/appearance/papers.py:1.11        Thu Sep 11 
13:26:08 2003
+++ fenfire/org/fenfire/fenpdf/appearance/papers.py     Mon Oct  6 04:52:24 2003
@@ -88,6 +88,7 @@
        self.spanImageFactory = \
           ff.spanimages.gl.DefaultSpanImageFactory(
                self.scrollBlockImager)
+       # self.spanImageFactory.poolManager.DICELENGTH = 10
        makerEntry = None
        if self.useBg:
            makerEntry = ff.spanimages.gl.papermakers\
Index: fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java
diff -u fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.8 
fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.9
--- fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.8  Mon Aug 
18 04:32:09 2003
+++ fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java      Mon Oct 
 6 04:52:24 2003
@@ -70,8 +70,8 @@
                                        s, poolManager);
 
        // x,y texcoords of (1,1) inside texture
-       float x1 = singleImage.loader.origWidth;
-       float y1 = singleImage.loader.origHeight;
+       float x1 = singleImage.loader.getMipzipFile().getOrigWidth();
+       float y1 = singleImage.loader.getMipzipFile().getOrigHeight();
 
        Dimension d = superImage.getSize();