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

diff --git a/src/org/xwt/translators/Freetype.java b/src/org/xwt/translators/Freetype.java
index de5e0c0..7fc5447 100644
--- a/src/org/xwt/translators/Freetype.java
+++ b/src/org/xwt/translators/Freetype.java
@@ -4,6 +4,9 @@ import org.xwt.util.*;
 import java.io.*;
 import java.util.zip.*;
 import java.util.*;
+import org.bouncycastle.util.encoders.Base64;
+
+import org.xwt.mips.Runtime;
 
 // FEATURE: use streams, not memoryfont's
 // FEATURE: kerning pairs
@@ -11,33 +14,31 @@ public class Freetype {
 
     public Freetype() { }
 
-    private static byte[] image = null;
-    private static final int FONT_RESERVED = 256*1024;
-
-    private org.xwt.mips.Interpreter vm = null;
+    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.log(this, "loading font " + res.getDescriptiveName());
+            Log.info(this, "loading font " + res);
             loadedStream = res;
-            InputStream is = res.getInputStream();
+            InputStream is = Stream.getInputStream(res);
             byte[] fontstream = InputStreamToByteArray.convert(is);
-            if (image == null) image = InputStreamToByteArray.convert(Main.builtin.getInputStream("freetype.mips"));
-            vm = new org.xwt.mips.Interpreter(image);
-            int baseAddr = vm.sbrk(FONT_RESERVED);
+            vm = new MIPSApps();
+            int baseAddr = vm.sbrk(fontstream.length);
             vm.copyout(fontstream, baseAddr, fontstream.length);
             vm.setUserInfo(0, baseAddr);
             vm.setUserInfo(1, fontstream.length);
-            vm.start(new String[]{ "freetype.mips" });
+            vm.start(new String[]{ "freetype" });
             vm.execute();
+            if(vm.getState() == Runtime.DONE) throw new Error("Freetype VM exited: " + vm.exitStatus());
         } catch (Exception e) {
-            Log.log(this, e);
+            Log.info(this, e);
         }
     }
 
-    public synchronized void renderGlyph(Font.Glyph glyph) {
+    public synchronized void renderGlyph(Font.Glyph glyph) throws IOException {
         try {
             if (loadedStream != glyph.font.res) loadFontByteStream(glyph.font.res);
             vm.setUserInfo(2, (int)glyph.c);
@@ -50,21 +51,15 @@ public class Freetype {
             glyph.baseline = vm.getUserInfo(10);
             glyph.advance = vm.getUserInfo(11);
             
-            int width = vm.getUserInfo(6);
-            int height = vm.getUserInfo(7);
-            if (width == 0 || height == 0) {
-                Log.log(Freetype.class, "warning glyph has zero width/height");
-                glyph.p = Platform.createAlphaOnlyPicture(new byte[] { }, 0, 0);
-                
-            } else {
-                byte[] data = new byte[width * height];
-                int addr = vm.getUserInfo(5);
-                vm.copyin(addr,data,width*height);
-                glyph.p = Platform.createAlphaOnlyPicture(data, width, height);
-            }
-
+            glyph.width = vm.getUserInfo(6);
+            glyph.height = vm.getUserInfo(7);
+            
+            glyph.data = new byte[glyph.width * glyph.height];
+            int addr = vm.getUserInfo(5);
+            vm.copyin(addr, glyph.data, glyph.width * glyph.height);
+            
         } catch (Exception e) {
-            Log.log(this, e);
+            Log.info(this, e);
         }
     }
 }