[Gzz-commits] gzz/gzz/view pagespanview.py xubuoy.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/08 06:14:21

Modified files:
        gzz/view       : pagespanview.py xubuoy.py 

Log message:
        Fix xupdf

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: gzz/gzz/view/pagespanview.py
diff -u gzz/gzz/view/pagespanview.py:1.18 gzz/gzz/view/pagespanview.py:1.19
--- gzz/gzz/view/pagespanview.py:1.18   Tue Oct 29 10:07:40 2002
+++ gzz/gzz/view/pagespanview.py        Fri Nov  8 06:14:21 2002
@@ -278,11 +278,11 @@
        pp = PutPapers()
        if cliprect:
            irr = vs.coords.affineCoordsys(0, 0, 
-                   (cliprect[0]+cliprect[2])/2,
-                   (cliprect[1]+cliprect[3])/2,
-                   (cliprect[2]-cliprect[0])/2,
+                   cliprect[0],
+                   cliprect[1],
+                   (cliprect[2]-cliprect[0]),
                    0, 0,
-                   (cliprect[3]-cliprect[1])/2)
+                   (cliprect[3]-cliprect[1]))
            vs.matcher.add(irr, key+"_irr")
 
            class FrameR(java.lang.Runnable):
Index: gzz/gzz/view/xubuoy.py
diff -u gzz/gzz/view/xubuoy.py:1.28 gzz/gzz/view/xubuoy.py:1.29
--- gzz/gzz/view/xubuoy.py:1.28 Mon Oct 28 04:44:53 2002
+++ gzz/gzz/view/xubuoy.py      Fri Nov  8 06:14:21 2002
@@ -58,7 +58,7 @@
 
 
 def background(rgb):
-    return gzz.vob.SolidBgVob(java.awt.Color(float(rgb[0]), float(rgb[1]), 
float(rgb[2])))
+    return gzz.vob.vobs.SolidBgVob(java.awt.Color(float(rgb[0]), 
float(rgb[1]), float(rgb[2])))
 
 fps_text = GLRen.createHorizText2(getFont(), "FOO", 1, 1, 1, 1)
 GL.setDebugVar("JNI.fps", 1)
@@ -526,13 +526,14 @@
 
        projdist = self.rad
 
-       bf = effects.CircleFloater4(vs, 0, (self.ctrx, self.ctry), 
-           self.rad, (self.ctrx - projdist, self.ctry))
-       bfforw = effects.CircleFloater4(vs, 0, (self.ctrx, self.ctry), 
-           self.rad, (self.ctrx + projdist, self.ctry))
+       bf = gzz.vob.buoy.CircleFloater4(vs, 0, self.ctrx, self.ctry,
+           self.rad, self.ctrx - projdist, self.ctry)
+       bfforw = gzz.vob.buoy.CircleFloater4(vs, 0, self.ctrx, self.ctry, 
+           self.rad, self.ctrx + projdist, self.ctry)
 
 
-       cs1 = bf.addCentralBuoy(self.cursor.getId())
+       cs1 = vs.coords.affineCoordsys(0, 0, self.ctrx, self.ctry, 1, 0, 0, 1)
+       vs.matcher.add(cs1, self.cursor.getId()) 
 
        cs1_nad = vs.coords.nadirOrigin(cs1, nadircs)
        vs.matcher.addSub(cs1, cs1_nad, "N")