From 1c0b740ca41037e48a4dcb3d995b2fd6e32d9b3c Mon Sep 17 00:00:00 2001
From: Matthias Kramm <kramm@quiss.org>
Date: Wed, 17 Mar 2010 16:56:40 -0700
Subject: [PATCH] fixed bug in unicode relocation

---
 lib/gfxfont.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index c1b82eb..760db9a 100644
--- a/lib/gfxfont.c
+++ b/lib/gfxfont.c
@@ -570,6 +570,7 @@ void gfxfont_fix_unicode(gfxfont_t*font)
 	    int u = font->glyphs[t].unicode;
 	    if(u>=0) {
 		assert(font->unicode2glyph[u]<0); // we took care of duplicates, right?
+		assert(u<font->max_unicode);
 		font->unicode2glyph[u] = t;
 	    }
 	}
@@ -691,7 +692,7 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
 	}
     } else {
 	int u;
-	for(u=1;u<ttf->unicode_size;u++) {
+	for(u=1;u<font->max_unicode;u++) {
 	    int g = font->unicode2glyph[u];
 	    if(g>=0 && u<32) {
 		msg("<warning> gfxfont_to_ttf: Font contains an invalid unicode (%d)", u);
-- 
1.7.10.4