type 0 fonts are now enabled by default

[swftools.git] / pdf2swf / SWFOutputDev.cc

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 020dc8f..fd753d5 100644 (file)
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -90,7 +90,7 @@ static int pagepos = 0;
 /* config */
 static double caplinewidth = 3.0;
 static int zoom = 72; /* xpdf: 86 */
-static int forceType0Fonts = 0;
+static int forceType0Fonts = 1;
 
 static void printInfoString(Dict *infoDict, char *key, char *fmt);
 static void printInfoDate(Dict *infoDict, char *key, char *fmt);
@@ -303,7 +303,7 @@ class InfoOutputDev:  public OutputDev
       GfxFont*font = state->getFont();
       if(!font)
           return;
-      char*id = getFontID(font);
+      /*char*id = getFontID(font);*/
       /* FIXME*/
       num_fonts++;
   }
@@ -527,13 +527,14 @@ static void showFontError(GfxFont*font, int nr)
 
 static void dumpFontInfo(char*loglevel, GfxFont*font)
 {
-  char* name = getFontID(font);
+  char* id = getFontID(font);
+  char* name = getFontName(font);
   Ref* r=font->getID();
-  msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, getFontName(font), r->num,r->gen);
+  msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, name, r->num,r->gen);
 
   GString*gstr  = font->getTag();
    
-  msg("%s| Tag: %s\n", loglevel, name);
+  msg("%s| Tag: %s\n", loglevel, id);
   
   if(font->isCIDFont()) msg("%s| is CID font\n", loglevel);
 
@@ -567,10 +568,12 @@ static void dumpFontInfo(char*loglevel, GfxFont*font)
   
   Ref embRef;
   GBool embedded = font->getEmbeddedFontID(&embRef);
-  if(font->getEmbeddedFontName())
-    name = font->getEmbeddedFontName()->getCString();
+  char*embeddedName=0;
+  if(font->getEmbeddedFontName()) {
+    embeddedName = font->getEmbeddedFontName()->getCString();
+  }
   if(embedded)
-   msg("%s| Embedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
+   msg("%s| Embedded id: %s id: %d\n",loglevel, FIXNULL(embeddedName), embRef.num);
 
   gstr = font->getExtFontFile();
   if(gstr)
@@ -582,6 +585,9 @@ static void dumpFontInfo(char*loglevel, GfxFont*font)
   if(font->isSymbolic()) msg("%s| is symbolic\n", loglevel);
   if(font->isItalic()) msg("%s| is italic\n", loglevel);
   if(font->isBold()) msg("%s| is bold\n", loglevel);
+
+  free(id);
+  free(name);
 }
 
 //void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) {printf("void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) \n");}
@@ -856,6 +862,32 @@ GBool SWFOutputDev::useGradients()
 char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible",
                       "clip+fill", "stroke+clip", "fill+stroke+clip", "clip"};
 
+static char tmp_printstr[4096];
+char* makeStringPrintable(char*str)
+{
+    int len = strlen(str);
+    int dots = 0;
+    if(len>=80) {
+       len = 80;
+       dots = 1;
+    }
+    int t;
+    for(t=0;t<len;t++) {
+       char c = str[t];
+       if(c<32 || c>124) {
+           c = '.';
+       }
+       tmp_printstr[t] = c;
+    }
+    if(dots) {
+       tmp_printstr[len++] = '.';
+       tmp_printstr[len++] = '.';
+       tmp_printstr[len++] = '.';
+    }
+    tmp_printstr[len] = 0;
+    return tmp_printstr;
+}
+
 void SWFOutputDev::beginString(GfxState *state, GString *s) 
 { 
     int render = state->getRender();
@@ -867,7 +899,7 @@ void SWFOutputDev::beginString(GfxState *state, GString *s)
     m21 *= state->getHorizScaling();
     swfoutput_setfontmatrix(&output, m11, -m21, m12, -m22);
     if(render != 3 && render != 0)
-       msg("<warning> Text rendering mode %d (%s) not fully supported yet (for text \"%s\")", render, renderModeDesc[render&7], s->getCString());
+       msg("<warning> Text rendering mode %d (%s) not fully supported yet (for text \"%s\")", render, renderModeDesc[render&7], makeStringPrintable(s->getCString()));
     states[statepos].textRender = render;
 }
 
@@ -932,9 +964,8 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
     if(font->isCIDFont()) {
        GfxCIDFont*cfont = (GfxCIDFont*)font;
 
-       if(font->getType() == fontCIDType2) {
+       if(font->getType() == fontCIDType2)
            CIDToGIDMap = cfont->getCIDToGID();
-       }
     } else {
        Gfx8BitFont*font8;
        font8 = (Gfx8BitFont*)font;
@@ -1412,7 +1443,7 @@ char* searchForSuitableFont(GfxFont*gfxFont)
     if (!fcinitcalled) {
         msg("<debug> Initializing FontConfig...");
         fcinitcalled = true;
-       if(FcInit()) {
+       if(!FcInit()) {
             msg("<debug> FontConfig Initialization failed. Disabling.");
             config_use_fontconfig = 0;
             return 0;
@@ -1440,7 +1471,7 @@ char* searchForSuitableFont(GfxFont*gfxFont)
         // if we get an exact match
         if (strcmp((char *)v, name) == 0) {
            if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) {
-               filename = strdup((char*)v);
+               filename = strdup((char*)v); // mem leak
                char *nfn = strrchr(filename, '/');
                if(nfn) fontname = strdup(nfn+1);
                else    fontname = filename;
@@ -1481,7 +1512,7 @@ char* searchForSuitableFont(GfxFont*gfxFont)
             match = FcFontMatch (0, pattern, &result);
             
             if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) {
-               filename = strdup((char*)v);
+               filename = strdup((char*)v); // mem leak
                char *nfn = strrchr(filename, '/');
                if(nfn) fontname = strdup(nfn+1);
                else    fontname = filename;
@@ -1515,7 +1546,7 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
     }
     filename = searchFont(fontname);
     if(!filename) {
-       msg("<error> Couldn't find font %s- did you install the default fonts?");
+       msg("<error> Couldn't find font %s- did you install the default fonts?", fontname);
        return 0;
     }
 
@@ -1524,12 +1555,12 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
        exit(1);
     }
     if(oldname) {
-       substitutesource[substitutepos] = oldname;
+       substitutesource[substitutepos] = strdup(oldname); //mem leak
        substitutetarget[substitutepos] = fontname;
        msg("<notice> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
        substitutepos ++;
     }
-    return strdup(filename);
+    return strdup(filename); //mem leak
 }
 
 void unlinkfont(char* filename)
@@ -1583,7 +1614,8 @@ void SWFOutputDev::updateFont(GfxState *state)
        too often */
     for(t=0;t<substitutepos;t++) {
        if(!strcmp(fontid, substitutesource[t])) {
-           fontid = substitutetarget[t];
+           free(fontid);fontid=0;
+           fontid = strdup(substitutetarget[t]);
            break;
        }
     }
@@ -1595,6 +1627,7 @@ void SWFOutputDev::updateFont(GfxState *state)
        swfoutput_setfont(&output, fontid, 0);
        
        msg("<debug> updateFont(%s) [cached]", fontid);
+       free(fontid);
        return;
     }
 
@@ -1604,6 +1637,7 @@ void SWFOutputDev::updateFont(GfxState *state)
            type3Warning = gTrue;
            showFontError(gfxFont, 2);
        }
+       free(fontid);
        return;
     }
 
@@ -1635,12 +1669,13 @@ void SWFOutputDev::updateFont(GfxState *state)
        msg("<warning> Font %s %scould not be loaded.", fontname, embedded?"":"(not embedded) ");
        msg("<warning> Try putting a TTF version of that font (named \"%s.ttf\") into /swftools/fonts", fontname);
        fileName = substituteFont(gfxFont, fontid);
-       if(fontid) { fontid = substitutetarget[substitutepos-1]; /*ugly hack*/};
+       if(fontid) { free(fontid);fontid = strdup(substitutetarget[substitutepos-1]); /*ugly hack*/};
        msg("<notice> Font is now %s (%s)", fontid, fileName);
     }
 
     if(!fileName) {
        msg("<error> Couldn't set font %s\n", fontid);
+       free(fontid);
        return;
     }
        
@@ -1653,6 +1688,7 @@ void SWFOutputDev::updateFont(GfxState *state)
        unlinkfont(fileName);
     if(fileName)
         free(fileName);
+    free(fontid);
 }
 
 #define SQR(x) ((x)*(x))