X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=bf172122192cb4faa9c2d16be6617b24cc479c90;hb=0a162092f2e591374358ab802debe969936e9c86;hp=98a6db256fd472d65fa15ca1a36eaf85c9b57365;hpb=b9b2c8cf73300427c3becd50dca9d5579c6a5cfa;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 98a6db2..bf17212 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -63,7 +63,7 @@ #include "SWFOutputDev.h" //swftools header files -#include "swfoutput.h" +#include "../lib/devices/swf.h" #include "../lib/log.h" #include "../lib/gfxdevice.h" #include "../lib/gfxtools.h" @@ -101,6 +101,8 @@ static int forceType0Fonts = 1; static void printInfoString(Dict *infoDict, char *key, char *fmt); static void printInfoDate(Dict *infoDict, char *key, char *fmt); +static char* lastfontdir = 0; + struct mapping { char*pdffont; char*filename; @@ -163,7 +165,7 @@ public: virtual void startPage(int pageNum, GfxState *state, double x1, double y1, double x2, double y2) ; void endframe(); - void* getSWF(); + void* get(char*name); //----- get info about output device @@ -1020,10 +1022,10 @@ int SWFOutputDev::save(char*filename) finish(); return result->save(result, filename); } -void* SWFOutputDev::getSWF() +void* SWFOutputDev::get(char*name) { finish(); - return result->get(result, "swf"); + return result->get(result, name); } SWFOutputDev::~SWFOutputDev() @@ -1178,7 +1180,6 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, double originX, double originY, CharCode c, Unicode *_u, int uLen) { - msg(" drawChar(%f,%f,%d)", x,y,c); int render = state->getRender(); // check for invisible text -- this is used by Acrobat Capture if (render == 3) { @@ -1228,8 +1229,9 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, Gfx8BitFont*font8; font8 = (Gfx8BitFont*)font; char**enc=font8->getEncoding(); - if(enc && enc[c]) + if(enc && enc[c] && strcasecmp(enc[c], "space")) { name = enc[c]; + } } if (CIDToGIDMap) { msg(" drawChar(%f, %f, c='%c' (%d), GID=%d, u=%d <%d>) CID=%d name=\"%s\" render=%d\n", x, y, (c&127)>=32?c:'?', c, CIDToGIDMap[c], u, uLen, font->isCIDFont(), FIXNULL(name), render); @@ -1257,8 +1259,8 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, } } - if(charid<0 && name) { - if(strcasecmp(name, "space")) { + if(charid<0) { + if(!name || strcasecmp(name, "space")) { msg(" Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)", FIXNULL(name),c, u, FIXNULL((char*)current_font_id), current_gfxfont->num_glyphs); } @@ -1922,7 +1924,7 @@ char* searchForSuitableFont(GfxFont*gfxFont) char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) { char*fontname = 0, *filename = 0; - msg(" subsituteFont(%s)", oldname); + msg(" substituteFont(%s)", oldname); if(!(fontname = searchForSuitableFont(gfxFont))) { fontname = "Times-Roman"; @@ -2005,8 +2007,11 @@ int SWFOutputDev::setGfxFont(char*id, char*filename, double maxSize) we have to divide 0.05 by (fontsize/1024) */ double quality = (1024 * 0.05) / maxSize; - + + msg(" Loading %s...", filename); font = gfxfont_load(filename, quality); + msg(" Font %s loaded successfully", filename); + l = new fontlist_t; l->font = font; l->filename = strdup(filename); @@ -2099,7 +2104,12 @@ void SWFOutputDev::updateFont(GfxState *state) if(!fileName) { char * fontname = getFontName(gfxFont); msg(" Font %s %scould not be loaded.", fontname, embedded?"":"(not embedded) "); - msg(" Try putting a TTF version of that font (named \"%s.ttf\") into /swftools/fonts", fontname); + + if(lastfontdir) + msg(" Try putting a TTF version of that font (named \"%s.ttf\") into %s", fontname, lastfontdir); + else + msg(" Try specifying one or more font directories"); + fileName = substituteFont(gfxFont, fontid); if(fontid) { free(fontid);fontid = strdup(substitutetarget[substitutepos-1]); /*ugly hack*/}; msg(" Font is now %s (%s)", fontid, fileName); @@ -2125,6 +2135,8 @@ void SWFOutputDev::updateFont(GfxState *state) if(fileName) free(fileName); free(fontid); + + msg(" |"); } #define SQR(x) ((x)*(x)) @@ -2180,13 +2192,13 @@ unsigned char* antialize(unsigned char*data, int width, int height, int newwidth #define IMAGE_TYPE_JPEG 0 #define IMAGE_TYPE_LOSSLESS 1 -static void drawimage(gfxdevice_t*dev, RGBA* data, int sizex,int sizey, +static void drawimage(gfxdevice_t*dev, gfxcolor_t* data, int sizex,int sizey, double x1,double y1, double x2,double y2, double x3,double y3, double x4,double y4, int type) { - RGBA*newpic=0; + gfxcolor_t*newpic=0; double l1 = sqrt((x4-x1)*(x4-x1) + (y4-y1)*(y4-y1)); double l2 = sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1)); @@ -2231,13 +2243,13 @@ static void drawimage(gfxdevice_t*dev, RGBA* data, int sizex,int sizey, dev->fillbitmap(dev, &p1, &img, &m, 0); } -void drawimagejpeg(gfxdevice_t*dev, RGBA*mem, int sizex,int sizey, +void drawimagejpeg(gfxdevice_t*dev, gfxcolor_t*mem, int sizex,int sizey, double x1,double y1, double x2,double y2, double x3,double y3, double x4,double y4) { drawimage(dev,mem,sizex,sizey,x1,y1,x2,y2,x3,y3,x4,y4, IMAGE_TYPE_JPEG); } -void drawimagelossless(gfxdevice_t*dev, RGBA*mem, int sizex,int sizey, +void drawimagelossless(gfxdevice_t*dev, gfxcolor_t*mem, int sizex,int sizey, double x1,double y1, double x2,double y2, double x3,double y3, double x4,double y4) { drawimage(dev,mem,sizex,sizey,x1,y1,x2,y2,x3,y3,x4,y4, IMAGE_TYPE_LOSSLESS); @@ -2301,7 +2313,7 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, unsigned char buf[8]; int x,y; unsigned char*pic = new unsigned char[width*height]; - RGBA pal[256]; + gfxcolor_t pal[256]; GfxRGB rgb; state->getFillRGB(&rgb); @@ -2352,14 +2364,14 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, float r = 255/(numpalette-1); int t; for(t=0;tgetNumPixelComps()!=1 || str->getKind()==strDCT) { - RGBA*pic=new RGBA[width*height]; + gfxcolor_t*pic=new gfxcolor_t[width*height]; for (y = 0; y < height; ++y) { for (x = 0; x < width; ++x) { imgStr->getPixel(pixBuf); colorMap->getRGB(pixBuf, &rgb); - pic[width*y+x].r = (U8)(rgb.r * 255 + 0.5); - pic[width*y+x].g = (U8)(rgb.g * 255 + 0.5); - pic[width*y+x].b = (U8)(rgb.b * 255 + 0.5); + pic[width*y+x].r = (unsigned char)(rgb.r * 255 + 0.5); + pic[width*y+x].g = (unsigned char)(rgb.g * 255 + 0.5); + pic[width*y+x].b = (unsigned char)(rgb.b * 255 + 0.5); pic[width*y+x].a = 255;//(U8)(rgb.a * 255 + 0.5); } } @@ -2394,8 +2406,8 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, delete imgStr; return; } else { - RGBA*pic=new RGBA[width*height]; - RGBA pal[256]; + gfxcolor_t*pic=new gfxcolor_t[width*height]; + gfxcolor_t pal[256]; int t; for(t=0;t<256;t++) { pixBuf[0] = t; @@ -2421,9 +2433,9 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, pal[t].a = 0; } } else*/ { - pal[t].r = (U8)(rgb.r * 255 + 0.5); - pal[t].g = (U8)(rgb.g * 255 + 0.5); - pal[t].b = (U8)(rgb.b * 255 + 0.5); + pal[t].r = (unsigned char)(rgb.r * 255 + 0.5); + pal[t].g = (unsigned char)(rgb.g * 255 + 0.5); + pal[t].b = (unsigned char)(rgb.b * 255 + 0.5); pal[t].a = 255;//(U8)(rgb.b * 255 + 0.5); } } @@ -2612,6 +2624,7 @@ void pdfswf_addfontdir(char*dirname) { #ifdef HAVE_DIRENT_H msg(" Adding %s to font directories", dirname); + lastfontdir = strdup(dirname); DIR*dir = opendir(dirname); if(!dir) { msg(" Couldn't open directory %s\n", dirname); @@ -2858,10 +2871,10 @@ int swf_output_save(swf_output_t*swf, char*filename) return ret; } -void* swf_output_get(swf_output_t*swf) +void* swf_output_get(swf_output_t*swf,char*name) { swf_output_internal_t*i= (swf_output_internal_t*)swf->internal; - void* ret = i->outputDev->getSWF(); + void* ret = i->outputDev->get(name); return ret; }