2004/01/13 19:27:16

darcs-hash:20040130074424-2ba56-645468020c614b6abd83f5358b723a2a72ddd3ec.gz

diff --git a/Makefile b/Makefile
index d9677b8..6641501 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/util/Preprocessor.java'))
+java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
 all_java_sources  := $(java_sources)
 
 nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) build/java/org/xwt/translators/Freetype.java build/java/org/xwt/translators/MSPack.java build/java/org/xwt/translators/MIPSApps.java 
@@ -147,7 +147,7 @@ build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java
        @echo -e "\n\033[1marchiving             .o -> .a\033[0m"
        mkdir -p build/$(platform)
        rm -f $@
-       upstream/install/$(target)/bin/ar rc $@ $?
+       upstream/install/$(target)/bin/ar rc $@ $^
        upstream/install/$(target)/bin/ranlib $@
 
 $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 

diff --git a/src/org/xwt/Font.java b/src/org/xwt/Font.java
index bd11c4f..2d9fcd7 100644 (file)
--- a/src/org/xwt/Font.java
+++ b/src/org/xwt/Font.java
@@ -66,7 +66,10 @@ public class Font {
         for(int i=0; i<text.length(); i++) {
             final char c = text.charAt(i);
             Glyph g = glyphs[c];
-            if (g == null) glyphs[c] = g = Platform.createGlyph(this, c);    // prepend so they are high priority
+            if (g == null) {
+                g = Platform.createGlyph(this, c);    // prepend so they are high priority
+                glyphs[c] = g;
+            }
             if (!g.isLoaded) {
                 glyphsToBeRendered.prepend(g);              // even if it's already in the queue, boost its priority
                 encounteredUnrenderedGlyph = true;
@@ -122,7 +125,6 @@ public class Font {
         if (g.isLoaded) { perform(); /* tailcall to the next glyph */ return; }
         //Log.info(Glyph.class, "rendering glyph " + g.c);
         try { freetype.renderGlyph(g); } catch (IOException e) { Log.info(Freetype.class, e); }
-        g.isLoaded = true;
         Scheduler.add(this);          // keep ourselves in the queue until there are no glyphs to render
         glyphRenderingTaskIsScheduled = true;
     } };