CIDFonts: look for external replacement.
[swftools.git] / pdf2swf / SWFOutputDev.cc
index 1bcd271..f0533fa 100644 (file)
 #include "Catalog.h"
 #include "Page.h"
 #include "PDFDoc.h"
-#include "Params.h"
 #include "Error.h"
 #include "config.h"
 #include "OutputDev.h"
 #include "GfxState.h"
 #include "GfxFont.h"
 #include "FontFile.h"
+#include "GlobalParams.h"
 //swftools header files
 #include "swfoutput.h"
 extern "C" {
@@ -48,6 +48,10 @@ extern "C" {
 #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;
 int numpages;
@@ -131,9 +135,13 @@ public:
 
   // Does this device use drawChar() or drawString()?
   virtual GBool useDrawChar();
+  
+  virtual GBool interpretType3Chars() {return gTrue;}
 
   //----- initialization and control
 
+  void startDoc(XRef *xref);
+
   // Start a page.
   virtual void startPage(int pageNum, GfxState *state) ;
 
@@ -172,9 +180,9 @@ public:
   virtual void beginString(GfxState *state, GString *s) ;
   virtual void endString(GfxState *state) ;
   virtual void drawChar(GfxState *state, double x, double y,
-                       double dx, double dy, Guchar c) ;
-  virtual void drawChar16(GfxState *state, double x, double y,
-                         double dx, double dy, int c) ;
+                       double dx, double dy,
+                       double originX, double originY,
+                       CharCode code, Unicode *u, int uLen);
 
   //----- image drawing
   virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
@@ -182,7 +190,11 @@ public:
                             GBool inlineImg);
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
                         int width, int height, GfxImageColorMap *colorMap,
-                        GBool inlineImg);
+                        int *maskColors, GBool inlineImg);
+  
+  virtual GBool beginType3Char(GfxState *state,
+                              CharCode code, Unicode *u, int uLen);
+  virtual void endType3Char(GfxState *state);
 
   private:
   void drawGeneralImage(GfxState *state, Object *ref, Stream *str,
@@ -191,15 +203,19 @@ public:
   int clipping[64];
   int clippos;
 
+  XRef*xref;
+
   int searchT1Font(char*name);
   char* substituteFont(GfxFont*gfxFont, char*oldname);
-  char* writeEmbeddedFontToFile(GfxFont*font);
+  char* writeEmbeddedFontToFile(XRef*ref, GfxFont*font);
   int t1id;
   int jpeginfo; // did we write "File contains jpegs" yet?
   int pbminfo; // did we write "File contains jpegs" yet?
   int linkinfo; // did we write "File contains links" yet?
   int ttfinfo; // did we write "File contains TrueType Fonts" yet?
 
+  int type3active; // are we between beginType3()/endType3()?
+
   GfxState *laststate;
 };
 
@@ -319,45 +335,43 @@ int lastdumppos = 0;
  */
 void showFontError(GfxFont*font, int nr) 
 {  
-    Ref r=font->getID();
+    Ref*r=font->getID();
     int t;
     for(t=0;t<lastdumppos;t++)
-       if(lastdumps[t] == r.num)
+       if(lastdumps[t] == r->num)
            break;
     if(t < lastdumppos)
       return;
     if(lastdumppos<sizeof(lastdumps)/sizeof(int))
-    lastdumps[lastdumppos++] = r.num;
+    lastdumps[lastdumppos++] = r->num;
     if(nr == 0)
       logf("<warning> The following font caused problems:");
     else if(nr == 1)
       logf("<warning> The following font caused problems (substituting):");
     else if(nr == 2)
-      logf("<warning> This document contains Type 3 Fonts: (some text may be incorrectly displayed)");
+      logf("<warning> The following Type 3 Font will be rendered as bitmap:");
     dumpFontInfo("<warning>", font);
 }
 
 void dumpFontInfo(char*loglevel, GfxFont*font)
 {
   GString *gstr;
-  char*name;
+  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);
+  Ref* r=font->getID();
+  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, FIXNULL(gstr->getCString()));
-  if(font->is16Bit()) logf("%sis 16 bit\n", loglevel);
+  
+  if(font->isCIDFont()) logf("%sis CID font\n", loglevel);
 
   GfxFontType type=font->getType();
   switch(type) {
     case fontUnknownType:
      logf("%sType: unknown\n",loglevel);
     break;
-    case fontType0:
-     logf("%sType: 0\n",loglevel);
-    break;
     case fontType1:
      logf("%sType: 1\n",loglevel);
     break;
@@ -370,11 +384,21 @@ void dumpFontInfo(char*loglevel, GfxFont*font)
     case fontTrueType:
      logf("%sType: TrueType\n",loglevel);
     break;
+    case fontCIDType0:
+     logf("%sType: CIDType0\n",loglevel);
+    break;
+    case fontCIDType0C:
+     logf("%sType: CIDType0C\n",loglevel);
+    break;
+    case fontCIDType2:
+     logf("%sType: CIDType2\n",loglevel);
+    break;
   }
   
   Ref embRef;
   GBool embedded = font->getEmbeddedFontID(&embRef);
-  name = font->getEmbeddedFontName();
+  if(font->getEmbeddedFontName())
+    name = font->getEmbeddedFontName()->getCString();
   if(embedded)
    logf("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
 
@@ -399,9 +423,11 @@ SWFOutputDev::SWFOutputDev()
     ttfinfo = 0;
     linkinfo = 0;
     pbminfo = 0;
+    type3active = 0;
     clippos = 0;
     clipping[clippos] = 0;
     outputstarted = 0;
+    xref = 0;
 //    printf("SWFOutputDev::SWFOutputDev() \n");
 };
 
@@ -552,37 +578,66 @@ void SWFOutputDev::beginString(GfxState *state, GString *s)
 }
 
 int charcounter = 0;
-void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, Guchar c) 
+int ciderror = 0;
+void SWFOutputDev::drawChar(GfxState *state, double x, double y,
+                       double dx, double dy,
+                       double originX, double originY,
+                       CharCode c, Unicode *u, int uLen)
 {
     logf("<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)
     {
-       FontEncoding*enc=state->getFont()->getEncoding();
+       GfxFont*font = state->getFont();
+       Gfx8BitFont*font8;
+       if(font->isCIDFont()) {
+          if(!ciderror)
+           logf("<error> Not drawing CID Font characters!");
+          ciderror++;
+          return;
+       }
+       if(font->getType() == fontType3) {
+          /* type 3 chars are passed primarily as graphics */
+          return;
+       }
+       font8 = (Gfx8BitFont*)font;
+
+       char**enc=font8->getEncoding();
 
        double x1,y1;
        x1 = x;
        y1 = y;
        state->transform(x, y, &x1, &y1);
 
-       if(enc->getCharName(c))
-         swfoutput_drawchar(&output, x1, y1, enc->getCharName(c), c);
+       if(enc[c])
+         swfoutput_drawchar(&output, x1, y1, enc[c], c);
        else
          logf("<warning> couldn't get name for character %02x from Encoding", c);
     }
 }
 
-void SWFOutputDev::drawChar16(GfxState *state, double x, double y, double dx, double dy, int c) 
-{
-    printf("<error> drawChar16(%f,%f,%f,%f,%08x)\n",x,y,dx,dy,c);
-    exit(1);
-}
-
 void SWFOutputDev::endString(GfxState *state) 
 { 
     logf("<debug> endstring\n");
 }    
 
+GBool SWFOutputDev::beginType3Char(GfxState *state,
+                              CharCode code, Unicode *u, int uLen)
+{
+    logf("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
+    type3active = 1;
+    /* the character itself is going to be passed using
+       drawImageMask() */
+    return gFalse; /* gTrue= is_in_cache? */
+}
+
+void SWFOutputDev::endType3Char(GfxState *state)
+{
+    type3active = 0;
+    logf("<debug> endType3Char");
+}
+
 void SWFOutputDev::startPage(int pageNum, GfxState *state) 
 {
   double x1,y1,x2,y2;
@@ -602,6 +657,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];
@@ -769,6 +825,11 @@ int SWFOutputDev::searchT1Font(char*name)
     int i;
     int mapid=-1;
     char*filename=0;
+    
+    char*name2 = 0;
+    if(name) name2 = strchr(name,'+');
+    if(name2) name2++;
+
     for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++) 
     {
        if(!strcmp(name, pdf2t1map[i].pdffont))
@@ -797,15 +858,20 @@ int SWFOutputDev::searchT1Font(char*name)
                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;
+
+           if(fontname) {
+               if((!strcmp(name, fontname)) || 
+                  (name2 && !strcmp(name2, 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)) {
+           if(strstr(fontname, name) || (name2 && strstr(fontname,name2))) {
                logf("<notice> Extra font %s is being used.\n", fontname);
                return i;
            }
@@ -840,38 +906,45 @@ void SWFOutputDev::updateStrokeColor(GfxState *state)
                                      (char)(rgb.b*255), (char)(opaq*255));
 }
 
-char*SWFOutputDev::writeEmbeddedFontToFile(GfxFont*font)
+char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 {
       char*tmpFileName = NULL;
       FILE *f;
       int c;
       char *fontBuf;
       int fontLen;
-      Type1CFontConverter *cvt;
+      Type1CFontFile *cvt;
       Ref embRef;
       Object refObj, strObj;
       tmpFileName = "/tmp/tmpfont";
-      font->getEmbeddedFontID(&embRef);
+      int ret;
+
+      ret = font->getEmbeddedFontID(&embRef);
+      if(!ret) {
+         /* not embedded- the caller should now search the font
+            directories for this font */
+         return 0;
+      }
 
       f = fopen(tmpFileName, "wb");
       if (!f) {
        logf("<error> Couldn't create temporary Type 1 font file");
-       return 0;
+         return 0;
       }
       if (font->getType() == fontType1C) {
-       if (!(fontBuf = font->readEmbFontFile(&fontLen))) {
+       if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
          fclose(f);
          logf("<error> Couldn't read embedded font file");
          return 0;
        }
-       cvt = new Type1CFontConverter(fontBuf, fontLen, f);
-       cvt->convert();
+       cvt = new Type1CFontFile(fontBuf, fontLen);
+       cvt->convertToType1(f);
        delete cvt;
        gfree(fontBuf);
       } else {
        font->getEmbeddedFontID(&embRef);
        refObj.initRef(embRef.num, embRef.gen);
-       refObj.fetch(&strObj);
+       refObj.fetch(ref, &strObj);
        refObj.free();
        strObj.streamReset();
        while ((c = strObj.streamGetChar()) != EOF) {
@@ -900,7 +973,7 @@ char*SWFOutputDev::writeEmbeddedFontToFile(GfxFont*font)
          tmpFileName = strdup(name2);
       }
 
-      return tmpFileName;
+    return tmpFileName;
 }
 
 char* gfxFontName(GfxFont* gfxFont)
@@ -912,8 +985,8 @@ char* gfxFontName(GfxFont* gfxFont)
       }
       else {
          char buf[32];
-         Ref r=gfxFont->getID();
-         sprintf(buf, "UFONT%d", r.num);
+         Ref*r=gfxFont->getID();
+         sprintf(buf, "UFONT%d", r->num);
          return strdup(buf);
       }
 }
@@ -924,7 +997,25 @@ int substitutepos = 0;
 
 char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
 {
-      //substitute font
+/* ------------------------------ V1 */
+
+    char*fontname = "Times-Roman";
+    this->t1id = searchT1Font(fontname);
+    if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
+       logf("<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));
+       substitutepos ++;
+    }
+    return fontname;
+
+/* ------------------------------ V2 */
+
+/*      //substitute font
       char* fontname = 0;
       double m11, m12, m21, m22;
       int index;
@@ -938,7 +1029,7 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
 
 //       printf("%d %s\n", t, gfxFont->getCharName(t));
       showFontError(gfxFont, 1);
-      if (!gfxFont->is16Bit()) {
+      if(1) { //if (!gfxFont->isCIDFont()) { FIXME: xpdf 1.01 does not have is16Bit()
        if(gfxFont->isSymbolic()) {
          if(fontname && (strstr(fontname,"ing"))) //Dingbats, Wingdings etc.
           index = 16;
@@ -1008,7 +1099,7 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
          logf("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
          substitutepos ++;
       }
-      return fontname;
+      return fontname;*/
 }
 
 void unlinkfont(char* filename)
@@ -1040,6 +1131,12 @@ void unlinkfont(char* filename)
     }
 }
 
+void SWFOutputDev::startDoc(XRef *xref) 
+{
+  this->xref = xref;
+}
+
+
 void SWFOutputDev::updateFont(GfxState *state) 
 {
   GfxFont*gfxFont = state->getFont();
@@ -1051,6 +1148,9 @@ void SWFOutputDev::updateFont(GfxState *state)
   char * fontname = gfxFontName(gfxFont);
  
   int t;
+  /* first, look if we substituted this font before-
+     this way, we don't initialize the T1 Fonts
+     too often */
   for(t=0;t<substitutepos;t++) {
       if(!strcmp(fontname, substitutesource[t])) {
          fontname = substitutetarget[t];
@@ -1058,6 +1158,9 @@ void SWFOutputDev::updateFont(GfxState *state)
       }
   }
 
+  /* second, see if swfoutput already has this font
+     cached- if so, we are done */
+
   if(swfoutput_queryfont(&output, fontname))
   {
       swfoutput_setfont(&output, fontname, -1, 0);
@@ -1069,17 +1172,18 @@ void SWFOutputDev::updateFont(GfxState *state)
     type3Warning = gTrue;
     showFontError(gfxFont, 2);
   }
-  //dumpFontInfo ("<notice>", gfxFont);
+
+  /* now either load the font, or find a substitution */
 
   Ref embRef;
   GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
   if(embedded) {
-    if (!gfxFont->is16Bit() &&
+    if (!gfxFont->isCIDFont() &&
        (gfxFont->getType() == fontType1 ||
         gfxFont->getType() == fontType1C ||
         gfxFont->getType() == fontTrueType)) {
        
-       fileName = writeEmbeddedFontToFile(gfxFont);
+       fileName = writeEmbeddedFontToFile(xref, gfxFont);
        if(!fileName) {
          logf("<error> Couldn't write font to file");
          showFontError(gfxFont,0);
@@ -1094,8 +1198,12 @@ void SWFOutputDev::updateFont(GfxState *state)
        }
     }
     else {
-       showFontError(gfxFont,0);
-       fontname = substituteFont(gfxFont, fontname);
+       int newt1id = searchT1Font(fontname);
+       if(newt1id<0) {
+           showFontError(gfxFont,0);
+           fontname = substituteFont(gfxFont, fontname);
+       } else
+           this->t1id = newt1id;
     }
   } else {
     if(fontname) {
@@ -1131,9 +1239,61 @@ void SWFOutputDev::updateFont(GfxState *state)
 int pic_xids[1024];
 int pic_yids[1024];
 int pic_ids[1024];
+int pic_width[1024];
+int pic_height[1024];
 int picpos = 0;
 int pic_id = 0;
 
+#define SQR(x) ((x)*(x))
+
+unsigned char* antialize(unsigned char*data, int width, int height, int newwidth, int newheight, int palettesize)
+{
+    if((newwidth<2 || newheight<2) ||
+       (width<=newwidth || height<=newheight))
+       return 0;
+    unsigned char*newdata;
+    int x,y;
+    newdata= (unsigned char*)malloc(newwidth*newheight);
+    int t;
+    double fx = (double)(width)/newwidth;
+    double fy = (double)(height)/newheight;
+    double px = 0;
+    int blocksize = (int)(8192/(fx*fy));
+    int r = 8192*256/palettesize;
+    for(x=0;x<newwidth;x++) {
+       double ex = px + fx;
+       int fromx = (int)px;
+       int tox = (int)ex;
+       int xweight1 = (int)(((fromx+1)-px)*256);
+       int xweight2 = (int)((ex-tox)*256);
+       double py =0;
+       for(y=0;y<newheight;y++) {
+           double ey = py + fy;
+           int fromy = (int)py;
+           int toy = (int)ey;
+           int yweight1 = (int)(((fromy+1)-py)*256);
+           int yweight2 = (int)((ey-toy)*256);
+           int a = 0;
+           int xx,yy;
+           for(xx=fromx;xx<=tox;xx++)
+           for(yy=fromy;yy<=toy;yy++) {
+               int b = 1-data[width*yy+xx];
+               int weight=256;
+               if(xx==fromx) weight = (weight*xweight1)/256;
+               if(xx==tox) weight = (weight*xweight2)/256;
+               if(yy==fromy) weight = (weight*yweight1)/256;
+               if(yy==toy) weight = (weight*yweight2)/256;
+               a+=b*weight;
+           }
+           //if(a) a=(palettesize-1)*r/blocksize;
+           newdata[y*newwidth+x] = (a*blocksize)/r;
+           py = ey;
+       }
+       px = ex;
+    }
+    return newdata;
+}
+
 void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
                                   int width, int height, GfxImageColorMap*colorMap, GBool invert,
                                   GBool inlineImg, int mask)
@@ -1145,17 +1305,26 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   ImageStream *imgStr;
   Guchar pixBuf[4];
   GfxRGB rgb;
+  int ncomps = 1;
+  int bits = 1;
+                                
+  if(colorMap) {
+    ncomps = colorMap->getNumPixelComps();
+    bits = colorMap->getBits();
+  }
+  imgStr = new ImageStream(str, width, ncomps,bits);
+  imgStr->reset();
+
   if(!width || !height || (height<=1 && width<=1))
   {
       logf("<verbose> Ignoring %d by %d image", width, height);
-      int i,j;
-      if (inlineImg) {
-       j = height * ((width + 7) / 8);
-       str->reset();
-       for (i = 0; i < j; ++i) {
-         str->getChar();
-       }
+      unsigned char buf[8];
+      int x,y;
+      for (y = 0; y < height; ++y)
+      for (x = 0; x < width; ++x) {
+         imgStr->getPixel(buf);
       }
+      delete imgStr;
       return;
   }
   
@@ -1164,206 +1333,215 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   state->transform(1, 0, &x3, &y3);
   state->transform(1, 1, &x4, &y4);
 
-  if (str->getKind() == strDCT &&
-      (colorMap->getNumPixelComps() == 3 || !mask) )
-  {
-    sprintf(fileName, "%s.jpg",mktmpname(0));
-    logf("<verbose> Found jpeg. Temporary storage is %s", fileName);
-    if(!jpeginfo)
-    {
-       logf("<notice> file contains jpeg pictures");
-       jpeginfo = 1;
-    }
-    if (!(fi = fopen(fileName, "wb"))) {
-      logf("<error> Couldn't open temporary image file '%s'", fileName);
-      return;
-    }
-    str = ((DCTStream *)str)->getRawStream();
-    str->reset();
-    int xid = 0;
-    int yid = 0;
-    int count = 0;
-    while ((c = str->getChar()) != EOF)
-    {
-      fputc(c, fi);
-      xid += count*c;
-      yid += (~count)*c;
-      count++;
-    }
-    fclose(fi);
-    
-    int t,found = -1;
-    for(t=0;t<picpos;t++)
-    {
-       if(pic_xids[t] == xid &&
-          pic_yids[t] == yid) {
-           found = t;break;
-       }
-    }
-    if(found<0) {
-       pic_ids[picpos] = swfoutput_drawimagejpeg(&output, fileName, width, height, 
-               x1,y1,x2,y2,x3,y3,x4,y4);
-       pic_xids[picpos] = xid;
-       pic_yids[picpos] = yid;
-       if(picpos<1024)
-           picpos++;
-    } else {
-       swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-               x1,y1,x2,y2,x3,y3,x4,y4);
-    }
-    unlink(fileName);
-  } else {
-
-    if(!pbminfo) {
-       logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
-       if(mask)
-       logf("<verbose> drawing %d by %d masked picture\n", width, height);
-       pbminfo = 1;
-    }
-
-    if(mask) {
-       imgStr = new ImageStream(str, width, 1, 1);
-       imgStr->reset();
-       //return;
-       int yes=0,i,j;
-       unsigned char buf[8];
-       int xid = 0;
-       int yid = 0;
-       int x,y;
-       int width2 = (width+3)&(~3);
-       unsigned char*pic = new unsigned char[width2*height];
-       RGBA pal[256];
-       GfxRGB rgb;
-       state->getFillRGB(&rgb);
-       pal[0].r = (int)(rgb.r*255); pal[0].g = (int)(rgb.g*255); 
-       pal[0].b = (int)(rgb.b*255); pal[0].a = 255;
-       pal[1].r = 0; pal[1].g = 0; pal[1].b = 0; pal[1].a = 0;
-       xid += pal[1].r*3 + pal[1].g*11 + pal[1].b*17;
-       yid += pal[1].r*7 + pal[1].g*5 + pal[1].b*23;
-       for (y = 0; y < height; ++y)
-        for (x = 0; x < width; ++x)
-       {
-             imgStr->getPixel(buf);
-              pic[width*y+x] = buf[0];
-             xid+=x*buf[0]+1;
-             yid+=y*buf[0]+1;
-       }
-       int t,found = -1;
-       for(t=0;t<picpos;t++)
-       {
-           if(pic_xids[t] == xid &&
-              pic_yids[t] == yid) {
-               found = t;break;
-           }
-       }
-       if(found<0) {
-           pic_ids[picpos] = swfoutput_drawimagelossless256(&output, pic, pal, width, height, 
-                   x1,y1,x2,y2,x3,y3,x4,y4);
-           pic_xids[picpos] = xid;
-           pic_yids[picpos] = yid;
-           if(picpos<1024)
-               picpos++;
-       } else {
-           swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-                   x1,y1,x2,y2,x3,y3,x4,y4);
-       }
-       free(pic);
-    } else {
-       int x,y;
-       int width2 = (width+3)&(~3);
-       imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
-                                  colorMap->getBits());
-       imgStr->reset();
+  if(!pbminfo && !(str->getKind()==strDCT)) {
+      if(!type3active) {
+         logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
+         pbminfo = 1;
+      }
+      if(mask)
+      logf("<verbose> drawing %d by %d masked picture\n", width, height);
+  }
+  if(!jpeginfo && (str->getKind()==strDCT)) {
+      logf("<notice> file contains jpeg pictures");
+      jpeginfo = 1;
+  }
 
-       if(colorMap->getNumPixelComps()!=1)
-       {
-           RGBA*pic=new RGBA[width*height];
-           int xid = 0;
-           int yid = 0;
-           for (y = 0; y < height; ++y) {
-             for (x = 0; x < width; ++x) {
-               int r,g,b,a;
-               imgStr->getPixel(pixBuf);
-               colorMap->getRGB(pixBuf, &rgb);
-               pic[width*y+x].r = r = (U8)(rgb.r * 255 + 0.5);
-               pic[width*y+x].g = g = (U8)(rgb.g * 255 + 0.5);
-               pic[width*y+x].b = b = (U8)(rgb.b * 255 + 0.5);
-               pic[width*y+x].a = a = 255;//(U8)(rgb.a * 255 + 0.5);
-               xid += x*r+x*b*3+x*g*7+x*a*11;
-               yid += y*r*3+y*b*17+y*g*19+y*a*11;
+  if(mask) {
+      int yes=0,i,j;
+      unsigned char buf[8];
+      int xid = 0;
+      int yid = 0;
+      int x,y;
+      unsigned char*pic = new unsigned char[width*height];
+      RGBA pal[256];
+      GfxRGB rgb;
+      state->getFillRGB(&rgb);
+      memset(pal,255,sizeof(pal));
+      pal[0].r = (int)(rgb.r*255); pal[0].g = (int)(rgb.g*255); 
+      pal[0].b = (int)(rgb.b*255); pal[0].a = 255;
+      pal[1].r = 0; pal[1].g = 0; pal[1].b = 0; pal[1].a = 0;
+      int numpalette = 2;
+      xid += pal[1].r*3 + pal[1].g*11 + pal[1].b*17;
+      yid += pal[1].r*7 + pal[1].g*5 + pal[1].b*23;
+      int realwidth = (int)sqrt(SQR(x2-x3) + SQR(y2-y3));
+      int realheight = (int)sqrt(SQR(x1-x2) + SQR(y1-y2));
+      for (y = 0; y < height; ++y)
+      for (x = 0; x < width; ++x)
+      {
+           imgStr->getPixel(buf);
+           if(invert) 
+               buf[0]=1-buf[0];
+           pic[width*y+x] = buf[0];
+           xid+=x*buf[0]+1;
+           yid+=y*buf[0]*3+1;
+      }
+      
+      /* the size of the drawn image is added to the identifier
+        as the same image may require different bitmaps if displayed
+        at different sizes (due to antialiasing): */
+      if(type3active) {
+         xid += realwidth;
+         yid += realheight;
+      }
+      int t,found = -1;
+      for(t=0;t<picpos;t++)
+      {
+         if(pic_xids[t] == xid &&
+            pic_yids[t] == yid) {
+             /* if the image was antialiased, the size has changed: */
+             width = pic_width[t];
+             height = pic_height[t];
+             found = t;break;
+         }
+      }
+      if(found<0) {
+         if(type3active) {
+             numpalette = 16;
+             unsigned char*pic2 = 0;
+             
+             pic2 = antialize(pic,width,height,realwidth,realheight, numpalette);
+
+             if(pic2) {
+                 width = realwidth;
+                 height = realheight;
+                 free(pic);
+                 pic = pic2;
+                 /* make a black/white palette */
+                 int t;
+                 GfxRGB rgb2;
+                 rgb2.r = 1 - rgb.r;
+                 rgb2.g = 1 - rgb.g;
+                 rgb2.b = 1 - rgb.b;
+
+                 float r = 255/(numpalette-1);
+                 for(t=0;t<numpalette;t++) {
+                     /*pal[t].r = (U8)(t*r*rgb.r+(numpalette-1-t)*r*rgb2.r);
+                     pal[t].g = (U8)(t*r*rgb.g+(numpalette-1-t)*r*rgb2.g);
+                     pal[t].b = (U8)(t*r*rgb.b+(numpalette-1-t)*r*rgb2.b);
+                     pal[t].a = 255; */
+                     pal[t].r = (U8)(255*rgb.r);
+                     pal[t].g = (U8)(255*rgb.g);
+                     pal[t].b = (U8)(255*rgb.b);
+                     pal[t].a = (U8)(t*r);
+                 }
              }
-           }
-           int t,found = -1;
-           for(t=0;t<picpos;t++)
-           {
-               if(pic_xids[t] == xid &&
-                  pic_yids[t] == yid) {
-                   found = t;break;
-               }
-           }
-           if(found<0) {
-               pic_ids[picpos] = swfoutput_drawimagelossless(&output, pic, width, height, 
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-               pic_xids[picpos] = xid;
-               pic_yids[picpos] = yid;
-               if(picpos<1024)
-                   picpos++;
-           } else {
-               swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-           }
-           delete pic;
+         }
+         pic_ids[picpos] = swfoutput_drawimagelosslessN(&output, pic, pal, width, height, 
+                 x1,y1,x2,y2,x3,y3,x4,y4, numpalette);
+         pic_xids[picpos] = xid;
+         pic_yids[picpos] = yid;
+         pic_width[picpos] = width;
+         pic_height[picpos] = height;
+         if(picpos<1024)
+             picpos++;
+      } else {
+         swfoutput_drawimageagain(&output, pic_ids[found], width, height,
+                 x1,y1,x2,y2,x3,y3,x4,y4);
+      }
+      free(pic);
+      delete imgStr;
+      return;
+  } 
+
+  int x,y;
+  
+  if(colorMap->getNumPixelComps()!=1 || str->getKind()==strDCT)
+  {
+      RGBA*pic=new RGBA[width*height];
+      int xid = 0;
+      int yid = 0;
+      for (y = 0; y < height; ++y) {
+       for (x = 0; x < width; ++x) {
+         int r,g,b,a;
+         imgStr->getPixel(pixBuf);
+         colorMap->getRGB(pixBuf, &rgb);
+         pic[width*y+x].r = r = (U8)(rgb.r * 255 + 0.5);
+         pic[width*y+x].g = g = (U8)(rgb.g * 255 + 0.5);
+         pic[width*y+x].b = b = (U8)(rgb.b * 255 + 0.5);
+         pic[width*y+x].a = a = 255;//(U8)(rgb.a * 255 + 0.5);
+         xid += x*r+x*b*3+x*g*7+x*a*11;
+         yid += y*r*3+y*b*17+y*g*19+y*a*11;
        }
-       else
-       {
-           U8*pic = new U8[width2*height];
-           RGBA pal[256];
-           int t;
-           int xid=0,yid=0;
-           for(t=0;t<256;t++)
-           {
-               int r,g,b,a;
-               pixBuf[0] = t;
-               colorMap->getRGB(pixBuf, &rgb);
-               pal[t].r = r = (U8)(rgb.r * 255 + 0.5);
-               pal[t].g = g = (U8)(rgb.g * 255 + 0.5);
-               pal[t].b = b = (U8)(rgb.b * 255 + 0.5);
-               pal[t].a = a = 255;//(U8)(rgb.b * 255 + 0.5);
-               xid += t*r+t*b*3+t*g*7+t*a*11;
-               xid += (~t)*r+t*b*3+t*g*7+t*a*11;
-           }
-           for (y = 0; y < height; ++y) {
-             for (x = 0; x < width; ++x) {
-               imgStr->getPixel(pixBuf);
-               pic[width2*y+x] = pixBuf[0];
-               xid += x*pixBuf[0]*7;
-               yid += y*pixBuf[0]*3;
-             }
-           }
-           int found = -1;
-           for(t=0;t<picpos;t++)
-           {
-               if(pic_xids[t] == xid &&
-                  pic_yids[t] == yid) {
-                   found = t;break;
-               }
-           }
-           if(found<0) {
-               pic_ids[picpos] = swfoutput_drawimagelossless256(&output, pic, pal, width, height, 
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-               pic_xids[picpos] = xid;
-               pic_yids[picpos] = yid;
-               if(picpos<1024)
-                   picpos++;
-           } else {
-               swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-           }
-           delete pic;
+      }
+      int t,found = -1;
+      for(t=0;t<picpos;t++)
+      {
+         if(pic_xids[t] == xid &&
+            pic_yids[t] == yid) {
+             found = t;break;
+         }
+      }
+      if(found<0) {
+         if(str->getKind()==strDCT)
+             pic_ids[picpos] = swfoutput_drawimagejpeg(&output, pic, width, height, 
+                     x1,y1,x2,y2,x3,y3,x4,y4);
+         else
+             pic_ids[picpos] = swfoutput_drawimagelossless(&output, pic, width, height, 
+                     x1,y1,x2,y2,x3,y3,x4,y4);
+         pic_xids[picpos] = xid;
+         pic_yids[picpos] = yid;
+         pic_width[picpos] = width;
+         pic_height[picpos] = height;
+         if(picpos<1024)
+             picpos++;
+      } else {
+         swfoutput_drawimageagain(&output, pic_ids[found], width, height,
+                 x1,y1,x2,y2,x3,y3,x4,y4);
+      }
+      delete pic;
+      delete imgStr;
+      return;
+  }
+  else
+  {
+      U8*pic = new U8[width*height];
+      RGBA pal[256];
+      int t;
+      int xid=0,yid=0;
+      for(t=0;t<256;t++)
+      {
+         int r,g,b,a;
+         pixBuf[0] = t;
+         colorMap->getRGB(pixBuf, &rgb);
+         pal[t].r = r = (U8)(rgb.r * 255 + 0.5);
+         pal[t].g = g = (U8)(rgb.g * 255 + 0.5);
+         pal[t].b = b = (U8)(rgb.b * 255 + 0.5);
+         pal[t].a = a = 255;//(U8)(rgb.b * 255 + 0.5);
+         xid += t*r+t*b*3+t*g*7+t*a*11;
+         xid += (~t)*r+t*b*3+t*g*7+t*a*11;
+      }
+      for (y = 0; y < height; ++y) {
+       for (x = 0; x < width; ++x) {
+         imgStr->getPixel(pixBuf);
+         pic[width*y+x] = pixBuf[0];
+         xid += x*pixBuf[0]*7;
+         yid += y*pixBuf[0]*3;
        }
-       delete imgStr;
-    }
-
+      }
+      int found = -1;
+      for(t=0;t<picpos;t++)
+      {
+         if(pic_xids[t] == xid &&
+            pic_yids[t] == yid) {
+             found = t;break;
+         }
+      }
+      if(found<0) {
+         pic_ids[picpos] = swfoutput_drawimagelosslessN(&output, pic, pal, width, height, 
+                 x1,y1,x2,y2,x3,y3,x4,y4,256);
+         pic_xids[picpos] = xid;
+         pic_yids[picpos] = yid;
+         pic_width[picpos] = width;
+         pic_height[picpos] = height;
+         if(picpos<1024)
+             picpos++;
+      } else {
+         swfoutput_drawimageagain(&output, pic_ids[found], width, height,
+                 x1,y1,x2,y2,x3,y3,x4,y4);
+      }
+      delete pic;
+      delete imgStr;
+      return;
   }
 }
 
@@ -1371,13 +1549,21 @@ 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);
   drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1);
 }
 
 void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-                              int width, int height,
-                              GfxImageColorMap *colorMap, GBool inlineImg) 
+                        int width, int height, GfxImageColorMap *colorMap,
+                        int *maskColors, GBool inlineImg)
 {
+  logf("<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(),
+             colorMap->getBits(),colorMap->getColorSpace()->getMode());
   drawGeneralImage(state,ref,str,width,height,colorMap,0,inlineImg,0);
 }
 
@@ -1430,14 +1616,11 @@ void pdfswf_init(char*filename, char*userPassword)
   GString *fileName = new GString(filename);
   GString *userPW;
   Object info;
-  // init error file
-  errorInit();
 
   // read config file
-  initParams(xpdfConfigFile);
+  globalParams = new GlobalParams("");
 
   // open PDF file
-  xref = NULL;
   if (userPassword && userPassword[0]) {
     userPW = new GString(userPassword);
   } else {
@@ -1453,7 +1636,8 @@ void pdfswf_init(char*filename, char*userPassword)
 
   // print doc info
   doc->getDocInfo(&info);
-  if (info.isDict()) {
+  if (info.isDict() &&
+    (screenloglevel>=LOGLEVEL_NOTICE)) {
     printInfoString(info.getDict(), "Title",        "Title:        %s\n");
     printInfoString(info.getDict(), "Subject",      "Subject:      %s\n");
     printInfoString(info.getDict(), "Keywords",     "Keywords:     %s\n");
@@ -1462,24 +1646,23 @@ void pdfswf_init(char*filename, char*userPassword)
     printInfoString(info.getDict(), "Producer",     "Producer:     %s\n");
     printInfoDate(info.getDict(),   "CreationDate", "CreationDate: %s\n");
     printInfoDate(info.getDict(),   "ModDate",      "ModDate:      %s\n");
+    printf("Pages:        %d\n", doc->getNumPages());
+    printf("Linearized:   %s\n", doc->isLinearized() ? "yes" : "no");
+    printf("Encrypted:    ");
+    if (doc->isEncrypted()) {
+      printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
+            doc->okToPrint() ? "yes" : "no",
+            doc->okToCopy() ? "yes" : "no",
+            doc->okToChange() ? "yes" : "no",
+            doc->okToAddNotes() ? "yes" : "no");
+    } else {
+      printf("no\n");
+    }
   }
   info.free();
 
-  // print page count
-  printf("Pages:        %d\n", doc->getNumPages());
   numpages = doc->getNumPages();
-  
-  // print linearization info
-  printf("Linearized:   %s\n", doc->isLinearized() ? "yes" : "no");
-
-  // print encryption info
-  printf("Encrypted:    ");
   if (doc->isEncrypted()) {
-    printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
-          doc->okToPrint() ? "yes" : "no",
-          doc->okToCopy() ? "yes" : "no",
-          doc->okToChange() ? "yes" : "no",
-          doc->okToAddNotes() ? "yes" : "no");
        /*ERROR: This pdf is encrypted, and disallows copying.
          Due to the DMCA, paragraph 1201, (2) A-C, circumventing
          a technological measure that efficively controls access to
@@ -1492,13 +1675,10 @@ void pdfswf_init(char*filename, char*userPassword)
        }
        if(!doc->okToChange() || !doc->okToAddNotes())
            swfoutput_setprotected();
-    }
-  else {
-    printf("no\n");
   }
 
-
   output = new SWFOutputDev();
+  output->startDoc(doc->getXRef());
 }
 
 void pdfswf_drawonlyshapes()
@@ -1521,6 +1701,11 @@ void pdfswf_storeallcharacters()
     storeallcharacters = 1;
 }
 
+void pdfswf_enablezlib()
+{
+    enablezlib = 1;
+}
+
 void pdfswf_jpegquality(int val)
 {
     if(val<0) val=0;
@@ -1565,15 +1750,21 @@ int pdfswf_numpages()
   return doc->getNumPages();
 }
 
+void pdfswf_insertstop()
+{
+    insertstoptag = 1;
+}
+
 int closed=0;
 void pdfswf_close()
 {
     logf("<debug> pdfswf.cc: pdfswf_close()");
     delete output;
     delete doc;
-    freeParams();
+    //freeParams();
     // check for memory leaks
     Object::memCheck(stderr);
     gMemReport(stderr);
 }
 
+