fixed font bug

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

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index 701c966..8fb751a 100644 (file)
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -118,19 +118,28 @@ 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)) {
     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)
 {
 }
 
 static int addSpace(gfxfont_t*font)
 {

+    /* first, make sure the new space char is the only char that'll use unicode 32 */
+    int t;
+    for(t=0;t<font->num_glyphs;t++) {
+       if(font->glyphs[t].unicode==32)
+           font->glyphs[t].unicode=0;
+    }

     font->num_glyphs++;
     font->glyphs = (gfxglyph_t*)realloc(font->glyphs, sizeof(gfxglyph_t)*font->num_glyphs);
     gfxglyph_t*g = &font->glyphs[font->num_glyphs-1];
     font->num_glyphs++;
     font->glyphs = (gfxglyph_t*)realloc(font->glyphs, sizeof(gfxglyph_t)*font->num_glyphs);
     gfxglyph_t*g = &font->glyphs[font->num_glyphs-1];

@@ -147,8 +156,7 @@ static int addSpace(gfxfont_t*font)
 
 static gfxfont_t* createGfxFont(FontInfo*src)
 {
 
 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);
 
     font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs);
     memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);

@@ -170,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;
            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;
            gfxdrawer_t drawer;
            gfxdrawer_target_gfxline(&drawer);
            int s;

@@ -221,8 +227,6 @@ static gfxfont_t* createGfxFont(FontInfo*src)
        }
     }
 
        }
     }
 

-    gfxfont_fix_unicode(font);
-

     int kerning_size = 0;
     for(t=0;t<src->num_glyphs;t++) {
        dict_t* d = src->kerning[t];
     int kerning_size = 0;
     for(t=0;t<src->num_glyphs;t++) {
        dict_t* d = src->kerning[t];

@@ -284,6 +288,7 @@ gfxfont_t* FontInfo::getGfxFont()
            this->space_char = addSpace(this->gfxfont);
            msg("<debug> Appending space char to font %s, position %d, width %f", this->gfxfont->id, this->space_char, this->gfxfont->glyphs[this->space_char].advance);
        }
            this->space_char = addSpace(this->gfxfont);
            msg("<debug> Appending space char to font %s, position %d, width %f", this->gfxfont->id, this->space_char, this->gfxfont->glyphs[this->space_char].advance);
        }

+       gfxfont_fix_unicode(this->gfxfont);

     }
     return this->gfxfont;
 }
     }
     return this->gfxfont;
 }

@@ -539,6 +544,16 @@ void InfoOutputDev::endType3Char(GfxState *state)
     currentglyph->path->lineTo(x1,y2);
     currentglyph->path->close();
 }
     currentglyph->path->lineTo(x1,y2);
     currentglyph->path->close();
 }

+    
+void InfoOutputDev::saveState(GfxState *state)
+{
+    updateAll(state);
+}
+
+void InfoOutputDev::restoreState(GfxState *state)
+{
+    updateAll(state);
+}

 
 void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
                           int width, int height, GBool invert,
 
 void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
                           int width, int height, GBool invert,