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

diff --git a/src/org/xwt/translators/Freetype.java b/src/org/xwt/translators/Freetype.java
index 7fc5447..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;
 
@@ -25,7 +22,7 @@ public class Freetype {
             loadedStream = res;
             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);