changed logf to msg.

diff --git a/lib/log.c b/lib/log.c
index 6313698..5cefd6e 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -244,7 +244,7 @@ static inline void log(char* logString)
    free (logBuffer);
 }
 
-void logf(const char* format, ...)
+void msg(const char* format, ...)
 {
     char buf[1024];
        va_list arglist;

diff --git a/lib/log.h b/lib/log.h
index 9ba8150..e9f757f 100644 (file)
--- a/lib/log.h
+++ b/lib/log.h
@@ -9,6 +9,9 @@
 
 #ifndef __log_h__
 #define __log_h__
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifdef __NT__
 #include "stdafx.h"
@@ -30,9 +33,12 @@
 extern int screenloglevel;
 
 extern void initLog(char* pLogDir, int fileloglevel, char* servAddr, char* logPort, int serverloglevel, int screenloglevel);
-extern void logf(const char* logFormat, ...);
+extern void msg(const char* logFormat, ...);
 extern void exitLog(void);
 
 #define FIXNULL(a) ((int)(a)?(a):"NULL")
 
+#ifdef __cplusplus
+}
+#endif
 #endif  // __log_h__

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index cef6733..b0472ba 100644 (file)
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -49,10 +49,7 @@
 #include "../lib/log.h"
 
 #include "ttf2pt1.h"
-
-#define logf logarithmf // logf is also used by ../lib/log.h
 #include <math.h>
-#undef logf
 
 static PDFDoc*doc = 0;
 static char* swffilename = 0;
@@ -353,11 +350,11 @@ void showFontError(GfxFont*font, int nr)
     if(lastdumppos<sizeof(lastdumps)/sizeof(int))
     lastdumps[lastdumppos++] = r->num;
     if(nr == 0)
-      logf("<warning> The following font caused problems:");
+      msg("<warning> The following font caused problems:");
     else if(nr == 1)
-      logf("<warning> The following font caused problems (substituting):");
+      msg("<warning> The following font caused problems (substituting):");
     else if(nr == 2)
-      logf("<warning> The following Type 3 Font will be rendered as bitmap:");
+      msg("<warning> The following Type 3 Font will be rendered as bitmap:");
     dumpFontInfo("<warning>", font);
 }
 
@@ -367,39 +364,39 @@ void dumpFontInfo(char*loglevel, GfxFont*font)
   char*name = 0;
   gstr = font->getName();
   Ref* r=font->getID();
-  logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?FIXNULL(gstr->getCString()):"(unknown font)", r->num,r->gen);
+  msg("%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, FIXNULL(gstr->getCString()));
+   msg("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString()));
   
-  if(font->isCIDFont()) logf("%sis CID font\n", loglevel);
+  if(font->isCIDFont()) msg("%sis CID font\n", loglevel);
 
   GfxFontType type=font->getType();
   switch(type) {
     case fontUnknownType:
-     logf("%sType: unknown\n",loglevel);
+     msg("%sType: unknown\n",loglevel);
     break;
     case fontType1:
-     logf("%sType: 1\n",loglevel);
+     msg("%sType: 1\n",loglevel);
     break;
     case fontType1C:
-     logf("%sType: 1C\n",loglevel);
+     msg("%sType: 1C\n",loglevel);
     break;
     case fontType3:
-     logf("%sType: 3\n",loglevel);
+     msg("%sType: 3\n",loglevel);
     break;
     case fontTrueType:
-     logf("%sType: TrueType\n",loglevel);
+     msg("%sType: TrueType\n",loglevel);
     break;
     case fontCIDType0:
-     logf("%sType: CIDType0\n",loglevel);
+     msg("%sType: CIDType0\n",loglevel);
     break;
     case fontCIDType0C:
-     logf("%sType: CIDType0C\n",loglevel);
+     msg("%sType: CIDType0C\n",loglevel);
     break;
     case fontCIDType2:
-     logf("%sType: CIDType2\n",loglevel);
+     msg("%sType: CIDType2\n",loglevel);
     break;
   }
   
@@ -408,18 +405,18 @@ void dumpFontInfo(char*loglevel, GfxFont*font)
   if(font->getEmbeddedFontName())
     name = font->getEmbeddedFontName()->getCString();
   if(embedded)
-   logf("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
+   msg("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
 
   gstr = font->getExtFontFile();
   if(gstr)
-   logf("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString()));
+   msg("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString()));
 
   // Get font descriptor flags.
-  if(font->isFixedWidth()) logf("%sis fixed width\n", loglevel);
-  if(font->isSerif()) logf("%sis serif\n", loglevel);
-  if(font->isSymbolic()) logf("%sis symbolic\n", loglevel);
-  if(font->isItalic()) logf("%sis italic\n", loglevel);
-  if(font->isBold()) logf("%sis bold\n", loglevel);
+  if(font->isFixedWidth()) msg("%sis fixed width\n", loglevel);
+  if(font->isSerif()) msg("%sis serif\n", loglevel);
+  if(font->isSymbolic()) msg("%sis symbolic\n", loglevel);
+  if(font->isItalic()) msg("%sis italic\n", loglevel);
+  if(font->isBold()) msg("%sis bold\n", loglevel);
 }
 
 //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");}
@@ -448,7 +445,7 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
     int cpos = 0;
     double lastx=0,lasty=0;
     if(!num) {
-       logf("<warning> empty path");
+       msg("<warning> empty path");
        outline->type = T1_PATHTYPE_MOVE;
        outline->dest.x = 0;
        outline->dest.y = 0;
@@ -512,7 +509,7 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
 
 void SWFOutputDev::stroke(GfxState *state) 
 {
-    logf("<debug> stroke\n");
+    msg("<debug> stroke\n");
     GfxPath * path = state->getPath();
     int lineCap = state->getLineCap(); // 0=butt, 1=round 2=square
     int lineJoin = state->getLineJoin(); // 0=miter, 1=round 2=bevel
@@ -551,7 +548,7 @@ void SWFOutputDev::stroke(GfxState *state)
 }
 void SWFOutputDev::fill(GfxState *state) 
 {
-    logf("<debug> fill\n");
+    msg("<debug> fill\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m21 = 0; m.m22 = 1;
@@ -562,7 +559,7 @@ void SWFOutputDev::fill(GfxState *state)
 }
 void SWFOutputDev::eoFill(GfxState *state) 
 {
-    logf("<debug> eofill\n");
+    msg("<debug> eofill\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m21 = 0; m.m22 = 1;
@@ -573,7 +570,7 @@ void SWFOutputDev::eoFill(GfxState *state)
 }
 void SWFOutputDev::clip(GfxState *state) 
 {
-    logf("<debug> clip\n");
+    msg("<debug> clip\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m22 = 1;
@@ -585,7 +582,7 @@ void SWFOutputDev::clip(GfxState *state)
 }
 void SWFOutputDev::eoClip(GfxState *state) 
 {
-    logf("<debug> eoclip\n");
+    msg("<debug> eoclip\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m21 = 0; m.m22 = 1;
@@ -602,19 +599,19 @@ SWFOutputDev::~SWFOutputDev()
 };
 GBool SWFOutputDev::upsideDown() 
 {
-    logf("<debug> upsidedown?");
+    msg("<debug> upsidedown?");
     return gTrue;
 };
 GBool SWFOutputDev::useDrawChar() 
 {
-    logf("<debug> usedrawchar?");
+    msg("<debug> usedrawchar?");
     return gTrue;
 }
 
 void SWFOutputDev::beginString(GfxState *state, GString *s) 
 { 
     double m11,m21,m12,m22;
-//    logf("<debug> %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString());
+//    msg("<debug> %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString());
     state->getFontTransMat(&m11, &m12, &m21, &m22);
     m11 *= state->getHorizScaling();
     m21 *= state->getHorizScaling();
@@ -627,7 +624,7 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
                        double originX, double originY,
                        CharCode c, Unicode *_u, int uLen)
 {
-    logf("<debug> drawChar(%f,%f,%f,%f,'%c')\n",x,y,dx,dy,c);
+    msg("<debug> drawChar(%f,%f,%f,%f,'%c')\n",x,y,dx,dy,c);
     
     // check for invisible text -- this is used by Acrobat Capture
     if ((state->getRender() & 3) == 3)
@@ -665,7 +662,7 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
        if(name)
           swfoutput_drawchar(&output, x1, y1, name, c);
        else
-          logf("<warning> couldn't get name for CID character %02x from Encoding", c);
+          msg("<warning> couldn't get name for CID character %02x from Encoding", c);
     } else {
        Gfx8BitFont*font8;
        font8 = (Gfx8BitFont*)font;
@@ -674,21 +671,21 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
        if(enc && enc[c])
           swfoutput_drawchar(&output, x1, y1, enc[c], c);
        else {
-          logf("<warning> couldn't get name for character %02x from Encoding", c);
+          msg("<warning> couldn't get name for character %02x from Encoding", c);
        }
     }
 }
 
 void SWFOutputDev::endString(GfxState *state) 
 { 
-    logf("<debug> endstring\n");
+    msg("<debug> endstring\n");
 }    
 
  
 GBool SWFOutputDev::beginType3Char(GfxState *state,
                               CharCode code, Unicode *u, int uLen)
 {
-    logf("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
+    msg("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
     type3active = 1;
     /* the character itself is going to be passed using
        drawImageMask() */
@@ -698,15 +695,15 @@ GBool SWFOutputDev::beginType3Char(GfxState *state,
 void SWFOutputDev::endType3Char(GfxState *state)
 {
     type3active = 0;
-    logf("<debug> endType3Char");
+    msg("<debug> endType3Char");
 }
 
 void SWFOutputDev::startPage(int pageNum, GfxState *state) 
 {
   double x1,y1,x2,y2;
   laststate = state;
-  logf("<debug> startPage %d\n", pageNum);
-  logf("<notice> processing page %d", pageNum);
+  msg("<debug> startPage %d\n", pageNum);
+  msg("<notice> processing page %d", pageNum);
 
   state->transform(state->getX1(),state->getY1(),&x1,&y1);
   state->transform(state->getX2(),state->getY2(),&x2,&y2);
@@ -720,7 +717,7 @@ void SWFOutputDev::startPage(int pageNum, GfxState *state)
 
 void SWFOutputDev::drawLink(Link *link, Catalog *catalog) 
 {
-  logf("<debug> drawlink\n");
+  msg("<debug> drawlink\n");
   double x1, y1, x2, y2, w;
   GfxRGB rgb;
   swfcoord points[5];
@@ -834,13 +831,13 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
        }
         break;
        default: {
-           logf("<error> Unknown link type!\n");
+           msg("<error> Unknown link type!\n");
            break;
        }
     }
     if(!linkinfo && (page || url))
     {
-       logf("<notice> File contains links");
+       msg("<notice> File contains links");
        linkinfo = 1;
     }
     if(page>0)
@@ -860,22 +857,22 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
     {
        swfoutput_namedlink(&output, named, points);
     }
-    logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page);
+    msg("<verbose> \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page);
   }
 }
 
 void SWFOutputDev::saveState(GfxState *state) {
-  logf("<debug> saveState\n");
+  msg("<debug> saveState\n");
   updateAll(state);
   if(clippos<64)
     clippos ++;
   else
-    logf("<error> Too many nested states in pdf.");
+    msg("<error> Too many nested states in pdf.");
   clipping[clippos] = 0;
 };
 
 void SWFOutputDev::restoreState(GfxState *state) {
-  logf("<debug> restoreState\n");
+  msg("<debug> restoreState\n");
   updateAll(state);
   while(clipping[clippos]) {
       swfoutput_endclip(&output);
@@ -917,12 +914,12 @@ int SWFOutputDev::searchT1Font(char*name)
            if(!fontname) {
                T1_LoadFont(i);
                fontname = T1_GetFontName (i);
-               logf("<verbose> Loading extra font %s from %s\n", FIXNULL(fontname), 
+               msg("<verbose> Loading extra font %s from %s\n", FIXNULL(fontname), 
                                                                  FIXNULL(T1_GetFontFileName(i)));
            }
 
            if(fontname && !strcmp(name, fontname)) {
-               logf("<notice> Extra font %d, \"%s\" is being used.\n", i, fontname);
+               msg("<notice> Extra font %d, \"%s\" is being used.\n", i, fontname);
                return i;
            }
            fontname = T1_GetFontFileName(i);
@@ -930,7 +927,7 @@ int SWFOutputDev::searchT1Font(char*name)
                    fontname = strrchr(fontname,'/')+1;
  
            if(strstr(fontname, name)) {
-               logf("<notice> Extra font %d, \"%s\" is being used.\n", i, fontname);
+               msg("<notice> Extra font %d, \"%s\" is being used.\n", i, fontname);
                return i;
            }
        }
@@ -989,7 +986,7 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 
       ret = font->getEmbeddedFontID(&embRef);
       if(!ret) {
-         logf("<verbose> Didn't get embedded font id");
+         msg("<verbose> Didn't get embedded font id");
          /* not embedded- the caller should now search the font
             directories for this font */
          return 0;
@@ -997,13 +994,13 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 
       f = fopen(tmpFileName, "wb");
       if (!f) {
-       logf("<error> Couldn't create temporary Type 1 font file");
+       msg("<error> Couldn't create temporary Type 1 font file");
          return 0;
       }
       if (font->getType() == fontType1C) {
        if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
          fclose(f);
-         logf("<error> Couldn't read embedded font file");
+         msg("<error> Couldn't read embedded font file");
          return 0;
        }
        cvt = new Type1CFontFile(fontBuf, fontLen);
@@ -1050,22 +1047,22 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
         font->getType() == fontCIDType2)
       {
          if(!ttfinfo) {
-             logf("<notice> File contains TrueType fonts");
+             msg("<notice> File contains TrueType fonts");
              ttfinfo = 1;
          }
          char name2[80];
          char*tmp;
          tmp = strdup(mktmpname((char*)name2));
          sprintf(name2, "%s", tmp);
-         char*a[] = {"./ttf2pt1",
+         char*a[] = {"./ttf2pt1", "-W0",
 #ifndef USE_FREETYPE
              "-pttf",
 #else
              "-pft",
 #endif
              "-b", tmpFileName, name2};
-         logf("<verbose> Invoking ttf2pt1...");
-         ttf2pt1_main(5,a);
+         msg("<verbose> Invoking ttf2pt1...");
+         ttf2pt1_main(6,a);
          unlink(tmpFileName);
          sprintf(name2,"%s.pfb",tmp);
          tmpFileName = strdup(name2);
@@ -1098,16 +1095,16 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
 /* ------------------------------ V1 */
 
     char*fontname = "Times-Roman";
-    logf("<verbose> substituteFont(,%s)", FIXNULL(oldname));
+    msg("<verbose> substituteFont(,%s)", FIXNULL(oldname));
     this->t1id = searchT1Font(fontname);
     if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
-       logf("<fatal> Too many fonts in file.");
+       msg("<fatal> Too many fonts in file.");
        exit(1);
     }
     if(oldname) {
        substitutesource[substitutepos] = oldname;
        substitutetarget[substitutepos] = fontname;
-       logf("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
+       msg("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
        substitutepos ++;
     }
     return fontname;
@@ -1189,13 +1186,13 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
         this->t1id = searchT1Font(fontname);
       }
       if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
-         logf("<fatal> Too many fonts in file.");
+         msg("<fatal> Too many fonts in file.");
          exit(1);
       }
       if(oldname) {
          substitutesource[substitutepos] = oldname;
          substitutetarget[substitutepos] = fontname;
-         logf("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
+         msg("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
          substitutepos ++;
       }
       return fontname;*/
@@ -1284,13 +1281,13 @@ void SWFOutputDev::updateFont(GfxState *state)
     {
        fileName = writeEmbeddedFontToFile(xref, gfxFont);
        if(!fileName) {
-         logf("<error> Couldn't write font to file");
+         msg("<error> Couldn't write font to file");
          showFontError(gfxFont,0);
          return ;
        }
        this->t1id = T1_AddFont(fileName);
        if(this->t1id<0) {
-         logf("<error> Couldn't load font from file");
+         msg("<error> Couldn't load font from file");
          showFontError(gfxFont,0);
          unlinkfont(fileName);
          return ;
@@ -1335,7 +1332,7 @@ void SWFOutputDev::updateFont(GfxState *state)
       return;
   }
 
-  logf("<verbose> Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, FIXNULL(fileName), FIXNULL(fontname));
+  msg("<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);
@@ -1422,7 +1419,7 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 
   if(!width || !height || (height<=1 && width<=1))
   {
-      logf("<verbose> Ignoring %d by %d image", width, height);
+      msg("<verbose> Ignoring %d by %d image", width, height);
       unsigned char buf[8];
       int x,y;
       for (y = 0; y < height; ++y)
@@ -1440,14 +1437,14 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 
   if(!pbminfo && !(str->getKind()==strDCT)) {
       if(!type3active) {
-         logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
+         msg("<notice> file contains pbm pictures %s",mask?"(masked)":"");
          pbminfo = 1;
       }
       if(mask)
-      logf("<verbose> drawing %d by %d masked picture\n", width, height);
+      msg("<verbose> drawing %d by %d masked picture\n", width, height);
   }
   if(!jpeginfo && (str->getKind()==strDCT)) {
-      logf("<notice> file contains jpeg pictures");
+      msg("<notice> file contains jpeg pictures");
       jpeginfo = 1;
   }
 
@@ -1654,7 +1651,7 @@ void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
                                   int width, int height, GBool invert,
                                   GBool inlineImg) 
 {
-  logf("<verbose> drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
+  msg("<verbose> drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
   drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1);
 }
 
@@ -1662,12 +1659,12 @@ void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
                         int width, int height, GfxImageColorMap *colorMap,
                         int *maskColors, GBool inlineImg)
 {
-  logf("<verbose> drawImage %dx%d, %s %s, inline=%d", width, height, 
+  msg("<verbose> drawImage %dx%d, %s %s, inline=%d", width, height, 
          colorMap?"colorMap":"no colorMap", 
          maskColors?"maskColors":"no maskColors",
          inlineImg);
   if(colorMap)
-      logf("<verbose> colorMap pixcomps:%d bits:%d mode:%d\n", colorMap->getNumPixelComps(),
+      msg("<verbose> colorMap pixcomps:%d bits:%d mode:%d\n", colorMap->getNumPixelComps(),
              colorMap->getBits(),colorMap->getColorSpace()->getMode());
   drawGeneralImage(state,ref,str,width,height,colorMap,0,inlineImg,0);
 }
@@ -1907,7 +1904,7 @@ int pdfswf_numpages()
 int closed=0;
 void pdfswf_close()
 {
-    logf("<debug> pdfswf.cc: pdfswf_close()");
+    msg("<debug> pdfswf.cc: pdfswf_close()");
     delete output;
     delete doc;
     //freeParams();

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index cff67d0..7f064cc 100644 (file)
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -325,11 +325,11 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath)
            strcat(searchpath, ":");
        strcat(searchpath, dirname);
     }
-    logf("<verbose> Adding %s to search path\n", dirname);
+    msg("<verbose> Adding %s to search path\n", dirname);
 
     DIR*dir = opendir(dirname);
     if(!dir) {
-       logf("<warning> Couldn't open directory %s\n", dirname);
+       msg("<warning> Couldn't open directory %s\n", dirname);
        return;
     }
     dirent*ent;
@@ -356,10 +356,10 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath)
                sprintf(buf, "%s/%s", dirname,name);
                fi = fopen(buf, "rb");
                if(!fi || !fread(&a,1,1,fi)) {
-                   logf("<warning> Couldn't read from %s", buf);
+                   msg("<warning> Couldn't read from %s", buf);
                }
                fprintf(database, "%s\n", buf);
-               logf("<verbose> Found font %s\n", buf);
+               msg("<verbose> Found font %s\n", buf);
                fclose(fi);
            } 
            if(numfonts)
@@ -416,7 +416,7 @@ int main(int argn, char *argv[])
     {
        if(filename) {
            outputname = stripfilename(filename, ".swf");
-           logf("<notice> Output filename not given. Writing to %s", outputname);
+           msg("<notice> Output filename not given. Writing to %s", outputname);
        } 
     }
        
@@ -434,7 +434,7 @@ int main(int argn, char *argv[])
        exit(0);
     }
 
-    logf("<verbose> reading font files from %s/fonts\n", SWFTOOLS_DATADIR);
+    msg("<verbose> reading font files from %s/fonts\n", SWFTOOLS_DATADIR);
     //TODO: use tempnam here. Check if environment already contains a
     //T1LIB_CONFIG.
     putenv( "T1LIB_CONFIG=/tmp/t1lib.config.tmp");
@@ -510,8 +510,8 @@ int main(int argn, char *argv[])
 
     if(viewer || preloader) {
 #ifndef SYSTEM_BACKTICKS
-       logf("<warning> Not sure whether system() can handle command substitution");
-       logf("<warning> (According to config.h, it can't)");
+       msg("<warning> Not sure whether system() can handle command substitution");
+       msg("<warning> (According to config.h, it can't)");
 #endif
        if(!system_quiet)
            printf("\n");
@@ -524,7 +524,7 @@ int main(int argn, char *argv[])
            printf("\n");
     }
     if(preloader && !viewer) {
-       logf("<warning> --preloader option without --viewer option doesn't make very much sense.");
+       msg("<warning> --preloader option without --viewer option doesn't make very much sense.");
        ret = systemf("swfcombine `swfdump -r %s` %s/swfs/PreLoaderTemplate.swf loader=%s movie=%s -o %s",
                preloader, SWFTOOLS_DATADIR, preloader, outputname, outputname);
        if(!system_quiet)

diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc
index f0d43e7..172b52b 100644 (file)
--- a/pdf2swf/swfoutput.cc
+++ b/pdf2swf/swfoutput.cc
@@ -29,9 +29,7 @@
 #else
 #define assert(a)
 #endif
-#define logf logarithmf // logf is also used by ../lib/log.h
 #include <math.h>
-#undef logf
 #include "swfoutput.h"
 #include "spline.h"
 extern "C" {
@@ -222,7 +220,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log)
         tag->id != ST_DEFINESHAPE2 &&
         tag->id != ST_DEFINESHAPE3)
     {
-        logf("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
+        msg("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
         exit(1);
     }
     double x=0,y=0;
@@ -283,7 +281,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log)
             spline(tag,p0,p1,p2,p3,m);
         } 
         else {
-           logf("<error> drawpath: unknown outline type:%d\n", outline->type);
+           msg("<error> drawpath: unknown outline type:%d\n", outline->type);
         }
         lastx=x;
         lasty=y;
@@ -661,7 +659,7 @@ void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatri
         tag->id != ST_DEFINESHAPE &&
         tag->id != ST_DEFINESHAPE2 &&
         tag->id != ST_DEFINESHAPE3) {
-        logf("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
+        msg("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
         exit(1);
     }
     assert(shapeid>=0);
@@ -753,11 +751,11 @@ static void putcharacters(TAG*tag)
 
     if(tag->id != ST_DEFINETEXT &&
         tag->id != ST_DEFINETEXT2) {
-        logf("<error> internal error: putcharacters needs an text tag, not %d\n",tag->id);
+        msg("<error> internal error: putcharacters needs an text tag, not %d\n",tag->id);
         exit(1);
     }
     if(!chardatapos) {
-        logf("<warning> putcharacters called with zero characters");
+        msg("<warning> putcharacters called with zero characters");
     }
 
     for(pass = 0; pass < 2; pass++)
@@ -906,7 +904,7 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha
         char* charname = character;
 
         if(!outline) {
-         logf("<warning> Didn't find %s in current charset (%s)", 
+         msg("<warning> Didn't find %s in current charset (%s)", 
                  FIXNULL(character),FIXNULL(font->getName()));
          return;
         }
@@ -991,7 +989,7 @@ SWFFont::SWFFont(char*name, int id, char*filename)
 
     if(!charnum) 
         return;
-    logf("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
+    msg("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
 
     this->standardtablesize = 256;
     if(this->charnum < this->standardtablesize)
@@ -1077,7 +1075,7 @@ SWFFont::~SWFFont()
 
     if(usednum && !drawonlyshapes)
     {
-        logf("<verbose> Font %s has %d used characters",FIXNULL(fontid), usednum);
+        msg("<verbose> Font %s has %d used characters",FIXNULL(fontid), usednum);
         TAG*ftag = swf_InsertTag(swf.firstTag,ST_DEFINEFONT);
         swf_SetU16(ftag, this->swfid);
         int initpos = swf_GetTagLen(ftag);
@@ -1173,7 +1171,7 @@ T1_OUTLINE*SWFFont::getOutline(char*name, int charnr)
        return getOutline(this->standardtable[charnr], -1);
     }
 
-    logf("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
+    msg("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
     return 0;
 }
 
@@ -1211,7 +1209,7 @@ int SWFFont::getSWFCharID(char*name, int charnr)
     if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) {
        return getSWFCharID(this->standardtable[charnr], -1);
     }
-    logf("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
+    msg("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
     return 0;
 }
 
@@ -1258,7 +1256,7 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filenam
     }
 
     if(t1id<0) {
-        logf("<error> internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid));
+        msg("<error> internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid));
     }
     
     SWFFont*font = new SWFFont(fontid, t1id, filename);
@@ -1326,7 +1324,7 @@ void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _size
   sizex = _sizex;
   sizey = _sizey;
 
-  logf("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
+  msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
 
   obj->font = 0;
   
@@ -1494,7 +1492,7 @@ void swfoutput_destroy(struct swfoutput* obj)
      fi = 1; // stdout
     
     if(fi<=0) {
-     logf("<fatal> Could not create \"%s\". ", FIXNULL(filename));
+     msg("<fatal> Could not create \"%s\". ", FIXNULL(filename));
      exit(1);
     }
  
@@ -1502,15 +1500,15 @@ void swfoutput_destroy(struct swfoutput* obj)
 
     if(enablezlib) {
       if FAILED(swf_WriteSWC(fi,&swf)) 
-       logf("<error> WriteSWC() failed.\n");
+       msg("<error> WriteSWC() failed.\n");
     } else {
       if FAILED(swf_WriteSWF(fi,&swf)) 
-       logf("<error> WriteSWF() failed.\n");
+       msg("<error> WriteSWF() failed.\n");
     }
 
     if(filename)
      close(fi);
-    logf("<notice> SWF written\n");
+    msg("<notice> SWF written\n");
 }
 
 void swfoutput_setdrawmode(swfoutput* obj, int mode)
@@ -1578,7 +1576,7 @@ void swfoutput_startclip(swfoutput*obj, T1_OUTLINE*outline, struct swfmatrix*m)
 
     if(clippos >= 127)
     {
-        logf("<warning> Too many clip levels.");
+        msg("<warning> Too many clip levels.");
         clippos --;
     } 
     
@@ -1605,7 +1603,7 @@ void swfoutput_endclip(swfoutput*obj)
      endshape();
 
     if(!clippos) {
-        logf("<error> Invalid end of clipping region");
+        msg("<error> Invalid end of clipping region");
         return;
     }
     clippos--;