#else
#define assert(a)
#endif
-#define logf logarithmf // logf is also used by ../lib/log.h
#include <math.h>
-#undef logf
#include "swfoutput.h"
#include "spline.h"
extern "C" {
tag->id != ST_DEFINESHAPE2 &&
tag->id != ST_DEFINESHAPE3)
{
- logf("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
+ msg("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
exit(1);
}
double x=0,y=0;
spline(tag,p0,p1,p2,p3,m);
}
else {
- logf("<error> drawpath: unknown outline type:%d\n", outline->type);
+ msg("<error> drawpath: unknown outline type:%d\n", outline->type);
}
lastx=x;
lasty=y;
tag->id != ST_DEFINESHAPE &&
tag->id != ST_DEFINESHAPE2 &&
tag->id != ST_DEFINESHAPE3) {
- logf("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
+ msg("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
exit(1);
}
assert(shapeid>=0);
if(tag->id != ST_DEFINETEXT &&
tag->id != ST_DEFINETEXT2) {
- logf("<error> internal error: putcharacters needs an text tag, not %d\n",tag->id);
+ msg("<error> internal error: putcharacters needs an text tag, not %d\n",tag->id);
exit(1);
}
if(!chardatapos) {
- logf("<warning> putcharacters called with zero characters");
+ msg("<warning> putcharacters called with zero characters");
}
for(pass = 0; pass < 2; pass++)
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))
{
if(m->m11 != m->m22)
usefonts=0;
+ if(!font) {
+ msg("<warning> Font is NULL");
+ }
+
if(usefonts && ! drawonlyshapes)
{
int charid = font->getSWFCharID(character, charnr);
+ if(charid<0) {
+ msg("<warning> Didn't find character '%s' (%d) in current charset (%s)",
+ FIXNULL(character),charnr, FIXNULL(font->getName()));
+ return;
+ }
if(shapeid>=0)
endshape();
if(textid<0)
char* charname = character;
if(!outline) {
- logf("<warning> Didn't find %s in current charset (%s)",
- FIXNULL(character),FIXNULL(font->getName()));
+ msg("<warning> Didn't find character '%s' (%d) in current charset (%s)",
+ FIXNULL(character),charnr,FIXNULL(font->getName()));
return;
}
this->fontid = strdup(name);
this->t1id = id;
- char**a= T1_GetAllCharNames(id);
+ char**charnamebase= T1_GetAllCharNames(id);
+ char**a= charnamebase;
int t, outlinepos=0;
char*map[256];
+ char*null = 0;
+ if(!a)
+ a=&null;
+
t=0;
while(a[t])
t++;
this->charnum = t;
- if(!charnum)
- return;
- logf("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
+ if(!charnum) {
+ this->standardtablesize = 0;
+ }
+ msg("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
this->standardtablesize = 256;
if(this->charnum < this->standardtablesize)
for(t = 0; t < this->standardtablesize; t++) {
char*name = T1_GetCharName(id,t);
- if(!name)
- name = "";
+ char chh[2] = "";
+ chh[0] = t;
+ if(!name || !strstr(name, "notdef")) {
+ if(t<standardEncodingSize) {
+ name = standardEncodingNames[t];
+ }
+ if(!name) {
+ name = ""; //TODO: store something like <%d>
+ }
+ }
standardtable[t] = strdup(name);
+ msg("<debug> Char %d is named %s\n", t, name);
}
outline = (T1_OUTLINE**)malloc(charnum*sizeof(T1_OUTLINE*));
t=0;
while(*a)
{
- map[t] = *a;
+ map[t] = strdup(*a);
a++;
t++;
if(t==256 || !*a) {
int ret = T1_ReencodeFont(id, map);
if(ret)
fprintf(stderr,"Can't reencode font: (%s) ret:%d\n",filename, ret);
+ /* Deleting the font invalidates the charname array,
+ so we have to ask for it again now.
+ We continue at the position we were, hoping the font
+ didn't shrink in the meantime or something.
+ */
+ a = T1_GetAllCharNames(id) + (a - charnamebase);
}
// parsecharacters
this->charname[outlinepos] = strdup(name);
outlinepos++;
}
+
+ for(s=0;s<t;s++)
+ free(map[s]);
t=0;
}
}
if(usednum && !drawonlyshapes)
{
- logf("<verbose> Font %s has %d used characters",FIXNULL(fontid), usednum);
+ msg("<verbose> 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);
}
free(ptr);
- free(outline);
+ if(outline)
+ free(outline);
for(t=0;t<charnum;t++)
free(charname[t]);
for(t=0;t<standardtablesize;t++)
/* if we didn't find it by name, use the names of the first 256 characters
of the font to try a new name based on charnr */
if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) {
- return getOutline(this->standardtable[charnr], -1);
+ T1_OUTLINE*ret = getOutline(this->standardtable[charnr], -1);
+ if(ret) return ret;
}
- logf("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
return 0;
}
/* if we didn't find it by name, use the names of the first 256 (or so) characters
of the font to try a new name based on charnr */
if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) {
- return getSWFCharID(this->standardtable[charnr], -1);
+ int ret = getSWFCharID(this->standardtable[charnr], -1);
+ if(ret) return ret;
}
- logf("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
- return 0;
+ return -1;
}
int SWFFont::getWidth(char*name)
}
if(t1id<0) {
- logf("<error> internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid));
+ msg("<error> internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid));
}
SWFFont*font = new SWFFont(fontid, t1id, filename);
}
/* initialize the swf writer */
-void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _sizey)
+void swfoutput_init(struct swfoutput* obj, char*_filename, int x1, int y1, int x2, int y2)
{
GLYPH *glyph;
RGBA rgb;
SRECT r;
memset(obj, 0, sizeof(struct swfoutput));
filename = _filename;
- sizex = _sizex;
- sizey = _sizey;
+ sizex = x2;
+ sizey = y2;
- logf("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
+ msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
obj->font = 0;
swf.fileVersion = flashversion;
swf.frameRate = 0x0040; // 1 frame per 4 seconds
- swf.movieSize.xmax = 20*sizex;
- swf.movieSize.ymax = 20*sizey;
+ swf.movieSize.xmin = 20*x1;
+ swf.movieSize.ymin = 20*y1;
+ swf.movieSize.xmax = 20*x2;
+ swf.movieSize.ymax = 20*y2;
+
+ depth = 1;
swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
tag = swf.firstTag;
- rgb.r = 0xff;
- rgb.g = 0xff;
- rgb.b = 0xff;
+ rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
swf_SetRGB(tag,&rgb);
- if(flag_protected) // good practice! /r
+
+ if(1)/* add white rectangle */
+ {
+ SRECT r;
+ SHAPE* s;
+ int ls1=0,fs1=0;
+ int shapeid = ++currentswfid;
+ r.xmin = x1*20;
+ r.ymin = y1*20;
+ r.xmax = x2*20;
+ r.ymax = y2*20;
+ tag = swf_InsertTag(tag, ST_DEFINESHAPE);
+ swf_ShapeNew(&s);
+ fs1 = swf_ShapeAddSolidFillStyle(s, &rgb);
+ swf_SetU16(tag,shapeid);
+ swf_SetRect(tag,&r);
+ swf_SetShapeHeader(tag,s);
+ swf_ShapeSetAll(tag,s,x1*20,y1*20,ls1,fs1,0);
+ swf_ShapeSetLine(tag,s,20*(x2-x1),0);
+ swf_ShapeSetLine(tag,s,0,20*(y2-y1));
+ swf_ShapeSetLine(tag,s,20*(x1-x2),0);
+ swf_ShapeSetLine(tag,s,0,20*(y1-y2));
+ swf_ShapeSetEnd(tag);
+ swf_ShapeFree(s);
+ tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
+ swf_ObjectPlace(tag,shapeid,depth++,0,0,0);
+ }
+
+ if(flag_protected)
tag = swf_InsertTag(tag, ST_PROTECT);
- depth = 1;
+
startdepth = depth;
}
fi = 1; // stdout
if(fi<=0) {
- logf("<fatal> Could not create \"%s\". ", FIXNULL(filename));
+ msg("<fatal> Could not create \"%s\". ", FIXNULL(filename));
exit(1);
}
if(enablezlib) {
if FAILED(swf_WriteSWC(fi,&swf))
- logf("<error> WriteSWC() failed.\n");
+ msg("<error> WriteSWC() failed.\n");
} else {
if FAILED(swf_WriteSWF(fi,&swf))
- logf("<error> WriteSWF() failed.\n");
+ msg("<error> WriteSWF() failed.\n");
}
if(filename)
close(fi);
- logf("<notice> SWF written\n");
+ msg("<notice> SWF written\n");
}
void swfoutput_setdrawmode(swfoutput* obj, int mode)
if(clippos >= 127)
{
- logf("<warning> Too many clip levels.");
+ msg("<warning> Too many clip levels.");
clippos --;
}
endshape();
if(!clippos) {
- logf("<error> Invalid end of clipping region");
+ msg("<error> Invalid end of clipping region");
return;
}
clippos--;