added -z option.

[swftools.git] / pdf2swf / SWFOutputDev.cc

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 6af4102..c7b9a66 100644 (file)
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -343,11 +343,11 @@ void dumpFontInfo(char*loglevel, GfxFont*font)
   char*name;
   gstr = font->getName();
   Ref r=font->getID();
-  logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?gstr->getCString():"(unknown font)", r.num,r.gen);
+  logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?FIXNULL(gstr->getCString()):"(unknown font)", r.num,r.gen);
 
   gstr  = font->getTag();
   if(gstr) 
-   logf("%sTag: %s\n", loglevel, gstr->getCString());
+   logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString()));
   if(font->is16Bit()) logf("%sis 16 bit\n", loglevel);
 
   GfxFontType type=font->getType();
@@ -376,11 +376,11 @@ void dumpFontInfo(char*loglevel, GfxFont*font)
   GBool embedded = font->getEmbeddedFontID(&embRef);
   name = font->getEmbeddedFontName();
   if(embedded)
-   logf("%sEmbedded name: %s id: %d\n",loglevel, name, embRef.num);
+   logf("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
 
   gstr = font->getExtFontFile();
   if(gstr)
-   logf("%sExternal Font file: %s\n", loglevel, gstr->getCString());
+   logf("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString()));
 
   // Get font descriptor flags.
   if(font->isFixedWidth()) logf("%sis fixed width\n", loglevel);
@@ -602,6 +602,7 @@ void SWFOutputDev::startPage(int pageNum, GfxState *state)
 
 void SWFOutputDev::drawLink(Link *link, Catalog *catalog) 
 {
+  logf("<debug> drawlink\n");
   double x1, y1, x2, y2, w;
   GfxRGB rgb;
   swfcoord points[5];
@@ -738,7 +739,7 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
     {
        swfoutput_namedlink(&output, named, points);
     }
-    logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, s, page);
+    logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page);
   }
 }
 
@@ -767,8 +768,6 @@ char type3Warning=0;
 int SWFOutputDev::searchT1Font(char*name) 
 {      
     int i;
-    
-    int id=-1;
     int mapid=-1;
     char*filename=0;
     for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++) 
@@ -779,17 +778,41 @@ int SWFOutputDev::searchT1Font(char*name)
            mapid = i;
        }
     }
-    if(filename)
-    for(i=0; i<T1_Get_no_fonts(); i++)
-    {
-       char*fontfilename = T1_GetFontFileName (i);
-       if(strstr(fontfilename, filename))
+    if(filename) {
+       for(i=0; i<T1_Get_no_fonts(); i++)
+       {
+           char*fontfilename = T1_GetFontFileName (i);
+           if(strstr(fontfilename, filename))
+           {
+                   pdf2t1map[i].id = mapid;
+                   return i;
+           }
+       }
+    } else {
+       for(i=0; i<T1_Get_no_fonts(); i++)
        {
-               id = i;
-               pdf2t1map[i].id = mapid;
+           char*fontname = T1_GetFontName (i);
+           if(!fontname) {
+               T1_LoadFont(i);
+               fontname = T1_GetFontName (i);
+               logf("<verbose> Loading extra font %s from %s\n", FIXNULL(fontname), 
+                                                                 FIXNULL(T1_GetFontFileName(i)));
+           }
+           if(fontname && !strcmp(name, fontname)) {
+               logf("<notice> Extra font %s is being used.\n", fontname);
+               return i;
+           }
+           fontname = T1_GetFontFileName(i);
+           if(strrchr(fontname,'/'))
+                   fontname = strrchr(fontname,'/')+1;
+ 
+           if(strstr(fontname, name)) {
+               logf("<notice> Extra font %s is being used.\n", fontname);
+               return i;
+           }
        }
     }
-    return id;
+    return -1;
 }
 
 void SWFOutputDev::updateLineWidth(GfxState *state)
@@ -983,7 +1006,7 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
       if(oldname) {
          substitutesource[substitutepos] = oldname;
          substitutetarget[substitutepos] = fontname;
-         logf("<verbose> substituting %s -> %s", oldname, fontname);
+         logf("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
          substitutepos ++;
       }
       return fontname;
@@ -1100,7 +1123,7 @@ void SWFOutputDev::updateFont(GfxState *state)
       return;
   }
 
-  logf("<verbose> Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, fileName, fontname);
+  logf("<verbose> Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, FIXNULL(fileName), FIXNULL(fontname));
   swfoutput_setfont(&output, fontname, this->t1id, fileName);
   if(fileName)
       unlinkfont(fileName);
@@ -1349,6 +1372,7 @@ void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
                                   int width, int height, GBool invert,
                                   GBool inlineImg) 
 {
+  logf("<debug> drawImageMask");
   drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1);
 }
 
@@ -1356,6 +1380,7 @@ void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
                               int width, int height,
                               GfxImageColorMap *colorMap, GBool inlineImg) 
 {
+  logf("<debug> drawImage");
   drawGeneralImage(state,ref,str,width,height,colorMap,0,inlineImg,0);
 }
 
@@ -1499,6 +1524,11 @@ void pdfswf_storeallcharacters()
     storeallcharacters = 1;
 }
 
+void pdfswf_enablezlib()
+{
+    enablezlib = 1;
+}
+
 void pdfswf_jpegquality(int val)
 {
     if(val<0) val=0;