2003/11/16 08:28:10

[org.ibex.core.git] / src / org / xwt / translators / Freetype.java

diff --git a/src/org/xwt/translators/Freetype.java b/src/org/xwt/translators/Freetype.java
index 9d89d7f..3079606 100644 (file)
--- a/src/org/xwt/translators/Freetype.java
+++ b/src/org/xwt/translators/Freetype.java
@@ -4,6 +4,7 @@ import org.xwt.util.*;
 import java.io.*;
 import java.util.zip.*;
 import java.util.*;
+import org.bouncycastle.util.encoders.Base64;
 
 // FEATURE: use streams, not memoryfont's
 // FEATURE: kerning pairs
@@ -12,21 +13,21 @@ public class Freetype {
     public Freetype() { }
 
     private static byte[] image = null;
-    private static final int FONT_RESERVED = 256*1024;
 
+    private int mem_allocated = 0;
     private org.xwt.mips.Interpreter vm = null;
 
     private Res loadedStream = null;
 
     public void loadFontByteStream(Res res) {
         try {
-            Log.log(this, "loading font " + res.getDescriptiveName());
+            Log.log(this, "loading font " + res);
             loadedStream = res;
             InputStream is = res.getInputStream();
             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);
+            int baseAddr = vm.sbrk(fontstream.length);
             vm.copyout(fontstream, baseAddr, fontstream.length);
             vm.setUserInfo(0, baseAddr);
             vm.setUserInfo(1, fontstream.length);
@@ -37,30 +38,32 @@ public class Freetype {
         }
     }
 
-    public synchronized void renderGlyph(Res res, Glyph glyph) {
+    public synchronized void renderGlyph(Font.Glyph glyph) throws IOException {
+        int width = 0;
+        int height = 0;
+        byte[] data = null;
+
         try {
-            if (loadedStream != res) loadFontByteStream(res);
+            if (loadedStream != glyph.font.res) loadFontByteStream(glyph.font.res);
             vm.setUserInfo(2, (int)glyph.c);
             vm.setUserInfo(3, (int)glyph.c);
-            vm.setUserInfo(4, glyph.pointsize);
+            vm.setUserInfo(4, glyph.font.pointsize);
             long start = System.currentTimeMillis();
             vm.execute();
-            glyph.max_ascent = vm.getUserInfo(8);
-            glyph.max_descent = vm.getUserInfo(9);
+            glyph.font.max_ascent = vm.getUserInfo(8);
+            glyph.font.max_descent = vm.getUserInfo(9);
             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");
-                
-            } 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);
-            }
+            width = vm.getUserInfo(6);
+            height = vm.getUserInfo(7);
+            
+            data = new byte[width * height];
+            int addr = vm.getUserInfo(5);
+            vm.copyin(addr,data,width*height);
+            
+            if (width == 0 || height == 0) Log.log(Freetype.class, "warning glyph has zero width/height");
+            glyph.p = Platform.createAlphaOnlyPicture(data, width, height);
         } catch (Exception e) {
             Log.log(this, e);
         }