#include <string.h>
#include <unistd.h>
//xpdf header files
+#include "gfile.h"
#include "GString.h"
#include "gmem.h"
#include "Object.h"
#include "Catalog.h"
#include "Page.h"
#include "PDFDoc.h"
-#include "Params.h"
#include "Error.h"
#include "config.h"
#include "OutputDev.h"
#include "swfoutput.h"
extern "C" {
#include "../lib/log.h"
+#include "ttf2pt1.h"
}
static PDFDoc*doc = 0;
// Does this device use drawChar() or drawString()?
virtual GBool useDrawChar();
+
+ virtual GBool interpretType3Chars() {return false;}
//----- initialization and control
void drawGeneralImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap*colorMap, GBool invert,
GBool inlineImg, int mask);
- int clipping[32];
+ int clipping[64];
int clippos;
- int setT1Font(char*name,FontEncoding*enc);
- char* substitutefont(GfxFont*gfxFont);
+ int searchT1Font(char*name);
+ char* substituteFont(GfxFont*gfxFont, char*oldname);
+ char* writeEmbeddedFontToFile(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?
GfxState *laststate;
};
*/
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)");
-
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?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, gstr->getCString());
- if(font->is16Bit()) logf("%sis 16 bit\n", loglevel);
+ logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString()));
+
+ //if(font->is16Bit()) logf("%sis 16 bit\n", loglevel); //FIXME: not existing in xpdf 1.01
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;
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, 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);
SWFOutputDev::SWFOutputDev()
{
jpeginfo = 0;
+ ttfinfo = 0;
linkinfo = 0;
pbminfo = 0;
clippos = 0;
{
int num = path->getNumSubpaths();
int s,t;
- bezierpathsegment*start,*last;
+ bezierpathsegment*start,*last=0;
bezierpathsegment*outline = start = new bezierpathsegment();
int cpos = 0;
double lastx=0,lasty=0;
m.m13 = 0; m.m23 = 0;
T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path);
swfoutput_startclip(&output, outline, &m);
- clipping[clippos] = 1;
+ clipping[clippos] ++;
}
void SWFOutputDev::eoClip(GfxState *state)
{
m.m12 = 0; m.m13 = 0; m.m23 = 0;
T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path);
swfoutput_startclip(&output, outline, &m);
- clipping[clippos] = 1;
+ clipping[clippos] ++;
}
SWFOutputDev::~SWFOutputDev()
state->getFontTransMat(&m11, &m12, &m21, &m22);
m11 *= state->getHorizScaling();
m21 *= state->getHorizScaling();
- swfoutput_setfontmatrix(&output, m11, -m12, m21, -m22);
+ swfoutput_setfontmatrix(&output, m11, -m21, m12, -m22);
}
int charcounter = 0;
// 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()) {
+ logf("<error> CID Font\n");
+ 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));
+ 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::drawLink(Link *link, Catalog *catalog)
{
+ logf("<debug> drawlink\n");
double x1, y1, x2, y2, w;
GfxRGB rgb;
swfcoord points[5];
char*s = "-?-";
char*type = "-?-";
char*url = 0;
+ char*named = 0;
int page = -1;
switch(action->getKind())
{
GString*name = l->getName();
if(name) {
s = name->lowerCase()->getCString();
+ named = name->getCString();
if(strstr(s, "next") || strstr(s, "forward"))
{
page = currentpage + 1;
{
swfoutput_linktourl(&output, url, points);
}
- logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, s, page);
+ else if(named)
+ {
+ swfoutput_namedlink(&output, named, points);
+ }
+ logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page);
}
}
void SWFOutputDev::saveState(GfxState *state) {
logf("<debug> saveState\n");
updateAll(state);
- clippos ++;
+ if(clippos<64)
+ clippos ++;
+ else
+ logf("<error> Too many nested states in pdf.");
clipping[clippos] = 0;
};
void SWFOutputDev::restoreState(GfxState *state) {
logf("<debug> restoreState\n");
updateAll(state);
- if(clipping[clippos])
+ while(clipping[clippos]) {
swfoutput_endclip(&output);
+ clipping[clippos]--;
+ }
clippos--;
}
char type3Warning=0;
-int SWFOutputDev::setT1Font(char*name, FontEncoding*encoding)
+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++)
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++)
{
- id = i;
- pdf2t1map[i].id = mapid;
+ 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++)
+ {
+ 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;
+ }
}
}
- if(id<0)
- return 0;
-
- this->t1id = id;
- return 1;
+ return -1;
}
void SWFOutputDev::updateLineWidth(GfxState *state)
(char)(rgb.b*255), (char)(opaq*255));
}
-char*writeEmbeddedFontToFile(GfxFont*font)
+char*SWFOutputDev::writeEmbeddedFontToFile(GfxFont*font)
{
- char*tmpFileName = NULL;
- char*fileName = NULL;
+/* char*tmpFileName = NULL;
FILE *f;
int c;
char *fontBuf;
int fontLen;
- Type1CFontConverter *cvt;
+// Type1CFontConverter *cvt;
Ref embRef;
Object refObj, strObj;
tmpFileName = "/tmp/tmpfont";
strObj.free();
}
fclose(f);
- fileName = tmpFileName;
- if(!fileName) {
- logf("<error> Embedded font writer didn't create a file");
- return 0;
+
+ if(font->getType() == fontTrueType)
+ {
+ if(!ttfinfo) {
+ logf("<notice> File contains TrueType fonts");
+ ttfinfo = 1;
+ }
+ char name2[80];
+ char*tmp;
+ tmp = strdup(mktmpname((char*)name2));
+ sprintf(name2, "%s", tmp);
+ char*a[] = {"./ttf2pt1","-pttf","-b", tmpFileName, name2};
+ logf("<verbose> Invoking ttf2pt1...");
+ ttf2pt1_main(5,a);
+ unlink(tmpFileName);
+ sprintf(name2,"%s.pfb",tmp);
+ tmpFileName = strdup(name2);
}
- return fileName;
+
+ return tmpFileName;*/
+
+ return 0;
}
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);
}
}
-char* SWFOutputDev::substitutefont(GfxFont*gfxFont)
+char* substitutetarget[256];
+char* substitutesource[256];
+int substitutepos = 0;
+
+char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
{
- //substitute font
+ return "Times-Roman";
+/* //substitute font
char* fontname = 0;
double m11, m12, m21, m22;
int index;
// printf("%d %s\n", t, gfxFont->getCharName(t));
showFontError(gfxFont, 1);
- if (!gfxFont->is16Bit()) {
+ if(1) { //if (!gfxFont->is16Bit()) { FIXME: xpdf 1.01 does not have is16Bit()
if(gfxFont->isSymbolic()) {
if(fontname && (strstr(fontname,"ing"))) //Dingbats, Wingdings etc.
index = 16;
}
}
}
- if(fontname)
- setT1Font(fontname, gfxFont->getEncoding());
- return fontname;
+ if(fontname) {
+ 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;*/
+}
+
+void unlinkfont(char* filename)
+{
+ int l;
+ if(!filename)
+ return;
+ l=strlen(filename);
+ unlink(filename);
+ if(!strncmp(&filename[l-4],".afm",4)) {
+ memcpy(&filename[l-4],".pfb",4);
+ unlink(filename);
+ memcpy(&filename[l-4],".pfa",4);
+ unlink(filename);
+ memcpy(&filename[l-4],".afm",4);
+ return;
+ } else
+ if(!strncmp(&filename[l-4],".pfa",4)) {
+ memcpy(&filename[l-4],".afm",4);
+ unlink(filename);
+ memcpy(&filename[l-4],".pfa",4);
+ return;
+ } else
+ if(!strncmp(&filename[l-4],".pfb",4)) {
+ memcpy(&filename[l-4],".afm",4);
+ unlink(filename);
+ memcpy(&filename[l-4],".pfb",4);
+ return;
+ }
}
void SWFOutputDev::updateFont(GfxState *state)
{
- char * fontname = 0;
GfxFont*gfxFont = state->getFont();
char * fileName = 0;
if (!gfxFont) {
return;
}
-
- if(gfxFont->getName()) {
- fontname = gfxFont->getName()->getCString();
+ char * fontname = gfxFontName(gfxFont);
+
+ int t;
+ for(t=0;t<substitutepos;t++) {
+ if(!strcmp(fontname, substitutesource[t])) {
+ fontname = substitutetarget[t];
+ break;
+ }
}
- if(swfoutput_queryfont(&output, gfxFontName(gfxFont)))
+ if(swfoutput_queryfont(&output, fontname))
{
- swfoutput_setfont(&output, gfxFontName(gfxFont), -1, 0);
+ swfoutput_setfont(&output, fontname, -1, 0);
return;
}
Ref embRef;
GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
if(embedded) {
- if (!gfxFont->is16Bit() &&
+ if (//!gfxFont->is16Bit() && FIXME: not in xpdf 1.01
(gfxFont->getType() == fontType1 ||
- gfxFont->getType() == fontType1C)) {
+ gfxFont->getType() == fontType1C ||
+ gfxFont->getType() == fontTrueType)) {
fileName = writeEmbeddedFontToFile(gfxFont);
- if(!fileName)
+ if(!fileName) {
+ logf("<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");
+ showFontError(gfxFont,0);
+ unlinkfont(fileName);
+ return ;
+ }
}
else {
showFontError(gfxFont,0);
- fontname = substitutefont(gfxFont);
+ fontname = substituteFont(gfxFont, fontname);
}
} else {
- if(!fontname || !setT1Font(state->getFont()->getName()->getCString(), gfxFont->getEncoding()))
- fontname = substitutefont(gfxFont);
+ if(fontname) {
+ int newt1id = searchT1Font(fontname);
+ if(newt1id<0) {
+ fontname = substituteFont(gfxFont, fontname);
+ } else
+ this->t1id = newt1id;
+ }
+ else
+ fontname = substituteFont(gfxFont, fontname);
}
- swfoutput_setfont(&output,gfxFontName(gfxFont),this->t1id, fileName);
+ if(t1id<0) {
+ showFontError(gfxFont,0);
+ return;
+ }
+
+ /* we may have done some substitutions here, so check
+ again if this font is cached. */
+ if(swfoutput_queryfont(&output, fontname))
+ {
+ swfoutput_setfont(&output, fontname, -1, 0);
+ return;
+ }
+
+ 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)
- unlink(fileName);
+ unlinkfont(fileName);
}
int pic_xids[1024];
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;
}
state->transform(1, 0, &x3, &y3);
state->transform(1, 1, &x4, &y4);
- if (str->getKind() == strDCT &&
- (colorMap->getNumPixelComps() == 3 || !mask) )
- {
- sprintf(fileName, "/tmp/tmp%08x.jpg",lrand48());
- 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(!pbminfo && !(str->getKind()==strDCT)) {
+ 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(!jpeginfo && (str->getKind()==strDCT)) {
+ logf("<notice> file contains jpeg pictures");
+ jpeginfo = 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(mask) {
+ 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);
+ // if(invert) buf[0]=255-buf[0]?
+ 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);
+ delete imgStr;
+ return;
+ }
- 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;
- }
- }
- 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;
+ 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;
+ 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_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;
+ delete imgStr;
+ return;
}
}
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);
}
int width, int height,
GfxImageColorMap *colorMap, GBool inlineImg)
{
+ logf("<verbose> drawImage %dx%d, %s, inline=%d", width, height,
+ colorMap?"colorMap":"no colorMap", 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);
}
GString *userPW;
Object info;
// init error file
- errorInit();
+ //errorInit(); FIXME xpdf 1.01
// read config file
- initParams(xpdfConfigFile);
+ //initParams(xpdfConfigFile); FIXME xpdf 1.01
// open PDF file
- xref = NULL;
if (userPassword && userPassword[0]) {
userPW = new GString(userPassword);
} else {
storeallcharacters = 1;
}
+void pdfswf_enablezlib()
+{
+ enablezlib = 1;
+}
+
void pdfswf_jpegquality(int val)
{
if(val<0) val=0;
for(t=0;t<pagepos;t++)
{
currentpage = pages[t];
- doc->displayPage((OutputDev*)output, currentpage, /*zoom*/100, /*rotate*/0, /*doLinks*/(int)1);
+ doc->displayPage((OutputDev*)output, currentpage, /*dpi*/72, /*rotate*/0, /*doLinks*/(int)1);
}
}
logf("<debug> pdfswf.cc: pdfswf_close()");
delete output;
delete doc;
- freeParams();
+ //freeParams();
// check for memory leaks
Object::memCheck(stderr);
gMemReport(stderr);
git.asbjorn.biz / swftools.git / blobdiff