X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=83dd43f272323a5a25a75e82fff7b2dcd51437c0;hp=e0fc2e3ac306a0adbc0f273b1bf44f284d13a97d;hb=67aada135687d9eb982fc243d994f9a6ad3ad673;hpb=9d29b25fe674ceacbdf4b7beaba2c0cc3405dbc6

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index e0fc2e3..83dd43f 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -118,15 +118,18 @@ static int findSpace(gfxfont_t*font)
     for(t=0;t<font->num_glyphs;t++) {
 	gfxglyph_t*g = &font->glyphs[t];
 	if(GLYPH_IS_SPACE(g)) {
-	    if(g->unicode == 32) return t;
-	    if(first_space<0)
-		first_space = t;
+	    if(g->unicode == 32) {
+		/* now that we have found a space char, make sure it's unique */
+		int s;
+		for(s=0;s<font->num_glyphs;s++) {
+		    if(s!=t && font->glyphs[s].unicode==32)
+			font->glyphs[s].unicode=0;
+		}
+		return t;
+	    }
 	}
     }
-    if(font->num_glyphs>32 && GLYPH_IS_SPACE(&font->glyphs[32])) {
-	return 32;
-    }
-    return first_space;
+    return -1;
 }
 
 static int addSpace(gfxfont_t*font)
@@ -153,8 +156,7 @@ static int addSpace(gfxfont_t*font)
 
 static gfxfont_t* createGfxFont(FontInfo*src)
 {
-    gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
-    memset(font, 0, sizeof(gfxfont_t));
+    gfxfont_t*font = (gfxfont_t*)rfx_calloc(sizeof(gfxfont_t));
 
     font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs);
     memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);
@@ -176,8 +178,6 @@ static gfxfont_t* createGfxFont(FontInfo*src)
 	    gfxglyph_t*glyph = &font->glyphs[font->num_glyphs];
 	    src->glyphs[t]->glyphid = font->num_glyphs;
 	    glyph->unicode = src->glyphs[t]->unicode;
-	    if(glyph->unicode >= font->max_unicode)
-		font->max_unicode = glyph->unicode+1;
 	    gfxdrawer_t drawer;
 	    gfxdrawer_target_gfxline(&drawer);
 	    int s;