[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/util PageSpanPaper.java pag...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire/util PageSpanPaper.java pag... |
Date: |
Thu, 27 Mar 2003 04:00:39 -0500 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/03/27 04:00:39
Modified files:
org/fenfire/util: PageSpanPaper.java pagespanpaper.test
Log message:
Paper test works *IF* you put a symlink of libvob/org/nongnu to
fenfire/org...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/PageSpanPaper.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/util/PageSpanPaper.java
diff -u fenfire/org/fenfire/util/PageSpanPaper.java:1.1
fenfire/org/fenfire/util/PageSpanPaper.java:1.2
--- fenfire/org/fenfire/util/PageSpanPaper.java:1.1 Wed Mar 26 13:15:10 2003
+++ fenfire/org/fenfire/util/PageSpanPaper.java Thu Mar 27 04:00:39 2003
@@ -38,8 +38,8 @@
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
-// public static gzz.gfx.gl.PaperMill paperMill;
-// public static gzz.client.GraphicsAPI.RenderingSurface paperMillWindow;
+ public static org.nongnu.libvob.gl.PaperMill paperMill;
+ public static org.nongnu.libvob.GraphicsAPI.RenderingSurface
paperMillWindow;
/** The page is in the range (0,0)..(w,h) in paper coordinates.
*/
@@ -128,7 +128,6 @@
}
- /*
private Paper getBg() {
if(bg == null) {
if(paperMill == null)
@@ -137,13 +136,11 @@
}
return bg;
}
- */
public Paper getPaper(boolean withBackground) {
return getPaper(withBackground, true);
}
public Paper getPaper(boolean withBackground, boolean withSpan) {
- /*
if(!withSpan) {
if(!withBackground) throw new Error("Can't do without both");
return getBg();
@@ -200,14 +197,13 @@
return bgPaper;
}
} else {
- */
if(noBgPaper == null) {
noBgPaper = new Paper();
addPaperPass(noBgPaper, setupOnlyPass);
}
return noBgPaper;
- // }
+ }
}
public void request(float importance, float pixels) {
Index: fenfire/org/fenfire/util/pagespanpaper.test
diff -u fenfire/org/fenfire/util/pagespanpaper.test:1.4
fenfire/org/fenfire/util/pagespanpaper.test:1.5
--- fenfire/org/fenfire/util/pagespanpaper.test:1.4 Thu Mar 27 02:53:07 2003
+++ fenfire/org/fenfire/util/pagespanpaper.test Thu Mar 27 04:00:39 2003
@@ -28,6 +28,16 @@
import java
+
+del(sys.modules["org"])
+del sys.modules["org.nongnu"]
+del sys.modules["org.nongnu.libvob"]
+import org.nongnu
+import org.nongnu.libvob
+import org.nongnu.libvob.paper
+import org.nongnu.libvob.paper.papermill
+
+
from org import fenfire
from org.nongnu import libvob as vob
from org.nongnu import alph
@@ -39,8 +49,20 @@
from org.fenfire.test import gfx
-# gzz.gfx.gl.PageSpanPaper.paperMill = gzz.gfx.gl.PaperMill.getInstance()
-# gzz.gfx.gl.PageSpanPaper.paperMillWindow = win
+import sys
+del sys.modules["org"]
+# del sys.modules["org.nongnu.libvob.paper"]
+
+import imp
+
+print "libvob: ",org.nongnu.libvob,"\n"
+# org.nongnu.libvob.__path__ = "../libvob/org/nongnu/libvob"
+
+import org.nongnu.libvob.paper
+print "PAPER MOD:'", org, org.nongnu, org.nongnu.libvob,
org.nongnu.libvob.paper,"'\n\n"
+import org.nongnu.libvob.paper.papermill
+fenfire.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
+fenfire.util.PageSpanPaper.paperMillWindow = fenfire.test.gfx.win
def setUp():
global sc
@@ -129,7 +151,7 @@
"""
# XXX Only without libpaper paper
- # checkPaper(0)
+ checkPaper(0)
checkPaper(1)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/util PageSpanPaper.java pag...,
Tuomas J. Lukka <=