// Does this device use drawChar() or drawString()?
virtual GBool useDrawChar();
- virtual GBool interpretType3Chars() {return gFalse;}
+ virtual GBool interpretType3Chars() {return gTrue;}
//----- initialization and control
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,
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,
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;
};
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);
}
if(gstr)
logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString()));
- //if(font->is16Bit()) logf("%sis 16 bit\n", loglevel); //FIXME: not existing in xpdf 1.01
+ if(font->isCIDFont()) logf("%sis CID font\n", loglevel);
GfxFontType type=font->getType();
switch(type) {
ttfinfo = 0;
linkinfo = 0;
pbminfo = 0;
+ type3active = 0;
clippos = 0;
clipping[clippos] = 0;
outputstarted = 0;
+ xref = 0;
// printf("SWFOutputDev::SWFOutputDev() \n");
};
}
int charcounter = 0;
-void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, Guchar c)
+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
GfxFont*font = state->getFont();
Gfx8BitFont*font8;
if(font->isCIDFont()) {
- logf("<error> CID Font\n");
+ logf("<error> CID Font");
+ return;
+ }
+ if(font->getType() == fontType3) {
+ /* type 3 chars are passed primarily as graphics */
return;
}
font8 = (Gfx8BitFont*)font;
}
}
-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;
Ref embRef;
GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
if(embedded) {
- if (//!gfxFont->is16Bit() && FIXME: not in xpdf 1.01
+ if (!gfxFont->isCIDFont() &&
(gfxFont->getType() == fontType1 ||
gfxFont->getType() == fontType1C ||
gfxFont->getType() == fontTrueType)) {
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");
}
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, inline=%d", width, height,
- colorMap?"colorMap":"no colorMap", 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());
GString *fileName = new GString(filename);
GString *userPW;
Object info;
- // init error file
- //errorInit(); FIXME xpdf 1.01
// read config file
globalParams = new GlobalParams("");
// 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");
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
}
if(!doc->okToChange() || !doc->okToAddNotes())
swfoutput_setprotected();
- }
- else {
- printf("no\n");
}
-
output = new SWFOutputDev();
+ output->startDoc(doc->getXRef());
}
void pdfswf_drawonlyshapes()