X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=13ba52f9ac78750427a9775671f52519797f82a8;hb=d9872c4e9c1c252d74d380d114eeb769c043e013;hp=f0d43e764fdb7fd7e7c6e4e96c8ce60dfba1915f;hpb=813c13d3a6050b4f081356b3f4b7edc3282c1162;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index f0d43e7..13ba52f 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -29,9 +29,7 @@ #else #define assert(a) #endif -#define logf logarithmf // logf is also used by ../lib/log.h #include -#undef logf #include "swfoutput.h" #include "spline.h" extern "C" { @@ -222,7 +220,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { - logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); + msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); exit(1); } double x=0,y=0; @@ -283,7 +281,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) spline(tag,p0,p1,p2,p3,m); } else { - logf(" drawpath: unknown outline type:%d\n", outline->type); + msg(" drawpath: unknown outline type:%d\n", outline->type); } lastx=x; lasty=y; @@ -661,7 +659,7 @@ void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatri tag->id != ST_DEFINESHAPE && tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { - logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); + msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); exit(1); } assert(shapeid>=0); @@ -753,11 +751,11 @@ static void putcharacters(TAG*tag) if(tag->id != ST_DEFINETEXT && tag->id != ST_DEFINETEXT2) { - logf(" internal error: putcharacters needs an text tag, not %d\n",tag->id); + msg(" internal error: putcharacters needs an text tag, not %d\n",tag->id); exit(1); } if(!chardatapos) { - logf(" putcharacters called with zero characters"); + msg(" putcharacters called with zero characters"); } for(pass = 0; pass < 2; pass++) @@ -819,8 +817,12 @@ static void putcharacters(TAG*tag) if(lastx != chardata[t].x || lasty != chardata[t].y) { - newx=chardata[t].x; - newy=chardata[t].y; + newx = chardata[t].x; + newy = chardata[t].y; + if(newx == 0) + newx = SET_TO_ZERO; + if(newy == 0) + newy = SET_TO_ZERO; } if(!colorcompare(&color, &chardata[t].color)) { @@ -890,6 +892,10 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha if(m->m11 != m->m22) usefonts=0; + if(!font) { + msg(" Font is NULL"); + } + if(usefonts && ! drawonlyshapes) { int charid = font->getSWFCharID(character, charnr); @@ -906,7 +912,7 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha char* charname = character; if(!outline) { - logf(" Didn't find %s in current charset (%s)", + msg(" Didn't find %s in current charset (%s)", FIXNULL(character),FIXNULL(font->getName())); return; } @@ -991,7 +997,7 @@ SWFFont::SWFFont(char*name, int id, char*filename) if(!charnum) return; - logf(" Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum); + msg(" Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum); this->standardtablesize = 256; if(this->charnum < this->standardtablesize) @@ -1077,7 +1083,7 @@ SWFFont::~SWFFont() if(usednum && !drawonlyshapes) { - logf(" Font %s has %d used characters",FIXNULL(fontid), usednum); + msg(" Font %s has %d used characters",FIXNULL(fontid), usednum); TAG*ftag = swf_InsertTag(swf.firstTag,ST_DEFINEFONT); swf_SetU16(ftag, this->swfid); int initpos = swf_GetTagLen(ftag); @@ -1173,7 +1179,7 @@ T1_OUTLINE*SWFFont::getOutline(char*name, int charnr) return getOutline(this->standardtable[charnr], -1); } - logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); + msg(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); return 0; } @@ -1211,7 +1217,7 @@ int SWFFont::getSWFCharID(char*name, int charnr) if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) { return getSWFCharID(this->standardtable[charnr], -1); } - logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); + msg(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); return 0; } @@ -1258,7 +1264,7 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filenam } if(t1id<0) { - logf(" internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid)); + msg(" internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid)); } SWFFont*font = new SWFFont(fontid, t1id, filename); @@ -1326,7 +1332,7 @@ void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _size sizex = _sizex; sizey = _sizey; - logf(" initializing swf output for size %d*%d\n", sizex,sizey); + msg(" initializing swf output for size %d*%d\n", sizex,sizey); obj->font = 0; @@ -1494,7 +1500,7 @@ void swfoutput_destroy(struct swfoutput* obj) fi = 1; // stdout if(fi<=0) { - logf(" Could not create \"%s\". ", FIXNULL(filename)); + msg(" Could not create \"%s\". ", FIXNULL(filename)); exit(1); } @@ -1502,15 +1508,15 @@ void swfoutput_destroy(struct swfoutput* obj) if(enablezlib) { if FAILED(swf_WriteSWC(fi,&swf)) - logf(" WriteSWC() failed.\n"); + msg(" WriteSWC() failed.\n"); } else { if FAILED(swf_WriteSWF(fi,&swf)) - logf(" WriteSWF() failed.\n"); + msg(" WriteSWF() failed.\n"); } if(filename) close(fi); - logf(" SWF written\n"); + msg(" SWF written\n"); } void swfoutput_setdrawmode(swfoutput* obj, int mode) @@ -1578,7 +1584,7 @@ void swfoutput_startclip(swfoutput*obj, T1_OUTLINE*outline, struct swfmatrix*m) if(clippos >= 127) { - logf(" Too many clip levels."); + msg(" Too many clip levels."); clippos --; } @@ -1605,7 +1611,7 @@ void swfoutput_endclip(swfoutput*obj) endshape(); if(!clippos) { - logf(" Invalid end of clipping region"); + msg(" Invalid end of clipping region"); return; } clippos--;