X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=fe0b573998da90cf740ba7d7920c353be5a29f97;hb=a13c36769b437418458b56b3919b726c932ec8a1;hp=5c21a98f55afce13638838040a01f61447a4faba;hpb=a4d5d87844a72f61db923cffdd654dc05d5cc066;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 5c21a98..fe0b573 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -132,7 +132,7 @@ public:
   // Does this device use drawChar() or drawString()?
   virtual GBool useDrawChar();
   
-  virtual GBool interpretType3Chars() {return gFalse;}
+  virtual GBool interpretType3Chars() {return gTrue;}
 
   //----- initialization and control
 
@@ -187,6 +187,10 @@ public:
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
 			 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,
@@ -206,6 +210,8 @@ public:
   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;
 };
 
@@ -339,7 +345,7 @@ void showFontError(GfxFont*font, int nr)
     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);
 }
 
@@ -413,6 +419,7 @@ SWFOutputDev::SWFOutputDev()
     ttfinfo = 0;
     linkinfo = 0;
     pbminfo = 0;
+    type3active = 0;
     clippos = 0;
     clipping[clippos] = 0;
     outputstarted = 0;
@@ -582,6 +589,10 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 	   logf("<error> CID Font");
 	   return;
        }
+       if(font->getType() == fontType3) {
+	   /* type 3 chars are passed primarily as graphics */
+	   return;
+       }
        font8 = (Gfx8BitFont*)font;
 
        char**enc=font8->getEncoding();
@@ -603,6 +614,23 @@ 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;
@@ -1233,10 +1261,12 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   state->transform(1, 1, &x4, &y4);
 
   if(!pbminfo && !(str->getKind()==strDCT)) {
-      logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
+      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);
-      pbminfo = 1;
   }
   if(!jpeginfo && (str->getKind()==strDCT)) {
       logf("<notice> file contains jpeg pictures");
@@ -1481,7 +1511,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");
@@ -1490,24 +1521,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
@@ -1520,13 +1550,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()