X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Ftranslators%2FFreetype.java;h=a7020e97f3668fdcb1aeae6f1988cec53d3d6f47;hb=3591b88b94a6bb378af3d4abe6eb5233ce583104;hp=3bff6028b0aafd76bf9d1bc8ee2173eb294b927a;hpb=e497cb520e0a5ef7de3db0f515af1822afb6a7a6;p=org.ibex.core.git

diff --git a/src/org/xwt/translators/Freetype.java b/src/org/xwt/translators/Freetype.java
index 3bff602..a7020e9 100644
--- a/src/org/xwt/translators/Freetype.java
+++ b/src/org/xwt/translators/Freetype.java
@@ -1,10 +1,7 @@
 package org.xwt.translators;
-import org.xwt.*;
-import org.xwt.util.*;
+import org.ibex.*;
+import org.ibex.util.*;
 import java.io.*;
-import java.util.zip.*;
-import java.util.*;
-import org.bouncycastle.util.encoders.Base64;
 
 import org.xwt.mips.Runtime;
 
@@ -17,15 +14,15 @@ public class Freetype {
     private int mem_allocated = 0;
     private Runtime vm = null;
 
-    private Res loadedStream = null;
+    private Stream loadedStream = null;
 
-    public void loadFontByteStream(Res res) {
+    public void loadFontByteStream(Stream res) {
         try {
             Log.info(this, "loading font " + res);
             loadedStream = res;
-            InputStream is = res.getInputStream();
+            InputStream is = Stream.getInputStream(res);
             byte[] fontstream = InputStreamToByteArray.convert(is);
-            vm = new MIPSApps();
+            vm = (Runtime)Class.forName("org.xwt.translators.MIPSApps").newInstance();
             int baseAddr = vm.sbrk(fontstream.length);
             vm.copyout(fontstream, baseAddr, fontstream.length);
             vm.setUserInfo(0, baseAddr);
@@ -40,7 +37,8 @@ public class Freetype {
 
     public synchronized void renderGlyph(Font.Glyph glyph) throws IOException {
         try {
-            if (loadedStream != glyph.font.res) loadFontByteStream(glyph.font.res);
+            Log.debug(this, "rasterizing glyph " + glyph.c + " of font " + glyph.font);
+            if (loadedStream != glyph.font.stream) loadFontByteStream(glyph.font.stream);
             vm.setUserInfo(2, (int)glyph.c);
             vm.setUserInfo(3, (int)glyph.c);
             vm.setUserInfo(4, glyph.font.pointsize);
@@ -57,6 +55,7 @@ public class Freetype {
             glyph.data = new byte[glyph.width * glyph.height];
             int addr = vm.getUserInfo(5);
             vm.copyin(addr, glyph.data, glyph.width * glyph.height);
+            glyph.isLoaded = true;
             
         } catch (Exception e) {
             Log.info(this, e);