fixed Makefile, removed annoying warning

[swftools.git] / lib / pdf / InfoOutputDev.cc

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index 9f04518..9ee7216 100644 (file)
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -17,6 +17,7 @@
 #include "../log.h"
 #include "../types.h"
 #include "../q.h"
+#include "../gfxfont.h"
 #include <math.h>
 #include <assert.h>
 
@@ -103,6 +104,8 @@ FontInfo::~FontInfo()
            }
            dict_destroy(d);
        }
+       free(kerning);
+       kerning=0;
     }
 }
 
@@ -204,7 +207,6 @@ static gfxfont_t* createGfxFont(FontInfo*src)
            if(src->glyphs[t]->advance>0) {
                glyph->advance = src->glyphs[t]->advance;
            } else {
-               msg("<warning> Approximating advance value for glyph %d", t);
                glyph->advance = xmax*scale;
            }
            if(config_bigchar) {
@@ -217,14 +219,8 @@ static gfxfont_t* createGfxFont(FontInfo*src)
            font->num_glyphs++;
        }
     }
-    font->unicode2glyph = (int*)malloc(sizeof(int)*font->max_unicode);
-    memset(font->unicode2glyph, -1, sizeof(int)*font->max_unicode);
-    for(t=0;t<font->num_glyphs;t++) {
-       if(font->glyphs[t].unicode>0 && font->glyphs[t].unicode<font->max_unicode) {
-           font->unicode2glyph[font->glyphs[t].unicode] = t;
-       }
 
-    }
+    gfxfont_fix_unicode(font);
 
     int kerning_size = 0;
     for(t=0;t<src->num_glyphs;t++) {