git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added some error checks.
[swftools.git]
/
pdf2swf
/
swfoutput.cc
diff --git
a/pdf2swf/swfoutput.cc
b/pdf2swf/swfoutput.cc
index
f0d43e7
..
5e5e4da
100644
(file)
--- a/
pdf2swf/swfoutput.cc
+++ b/
pdf2swf/swfoutput.cc
@@
-29,9
+29,7
@@
#else
#define assert(a)
#endif
#else
#define assert(a)
#endif
-#define logf logarithmf // logf is also used by ../lib/log.h
#include <math.h>
#include <math.h>
-#undef logf
#include "swfoutput.h"
#include "spline.h"
extern "C" {
#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)
{
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;
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 {
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;
}
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) {
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);
exit(1);
}
assert(shapeid>=0);
@@
-753,11
+751,11
@@
static void putcharacters(TAG*tag)
if(tag->id != ST_DEFINETEXT &&
tag->id != ST_DEFINETEXT2) {
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) {
exit(1);
}
if(!chardatapos) {
- logf("<warning> putcharacters called with zero characters");
+ msg("<warning> putcharacters called with zero characters");
}
for(pass = 0; pass < 2; pass++)
}
for(pass = 0; pass < 2; pass++)
@@
-819,8
+817,12
@@
static void putcharacters(TAG*tag)
if(lastx != chardata[t].x ||
lasty != chardata[t].y)
{
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(!colorcompare(&color, &chardata[t].color))
{
@@
-890,9
+892,18
@@
static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha
if(m->m11 != m->m22)
usefonts=0;
if(m->m11 != m->m22)
usefonts=0;
+ if(!font) {
+ msg("<warning> Font is NULL");
+ }
+
if(usefonts && ! drawonlyshapes)
{
int charid = font->getSWFCharID(character, charnr);
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)
if(shapeid>=0)
endshape();
if(textid<0)
@@
-906,8
+917,8
@@
static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha
char* charname = character;
if(!outline) {
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;
}
return;
}
@@
-980,18
+991,24
@@
SWFFont::SWFFont(char*name, int id, char*filename)
this->fontid = strdup(name);
this->t1id = id;
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];
int t, outlinepos=0;
char*map[256];
+ char*null = 0;
+ if(!a)
+ a=&null;
+
t=0;
while(a[t])
t++;
this->charnum = t;
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)
this->standardtablesize = 256;
if(this->charnum < this->standardtablesize)
@@
-1000,9
+1017,18
@@
SWFFont::SWFFont(char*name, int id, char*filename)
for(t = 0; t < this->standardtablesize; t++) {
char*name = T1_GetCharName(id,t);
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);
standardtable[t] = strdup(name);
+ msg("<debug> Char %d is named %s\n", t, name);
}
outline = (T1_OUTLINE**)malloc(charnum*sizeof(T1_OUTLINE*));
}
outline = (T1_OUTLINE**)malloc(charnum*sizeof(T1_OUTLINE*));
@@
-1022,7
+1048,7
@@
SWFFont::SWFFont(char*name, int id, char*filename)
t=0;
while(*a)
{
t=0;
while(*a)
{
- map[t] = *a;
+ map[t] = strdup(*a);
a++;
t++;
if(t==256 || !*a) {
a++;
t++;
if(t==256 || !*a) {
@@
-1037,6
+1063,12
@@
SWFFont::SWFFont(char*name, int id, char*filename)
int ret = T1_ReencodeFont(id, map);
if(ret)
fprintf(stderr,"Can't reencode font: (%s) ret:%d\n",filename, ret);
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
}
// parsecharacters
@@
-1049,6
+1081,9
@@
SWFFont::SWFFont(char*name, int id, char*filename)
this->charname[outlinepos] = strdup(name);
outlinepos++;
}
this->charname[outlinepos] = strdup(name);
outlinepos++;
}
+
+ for(s=0;s<t;s++)
+ free(map[s]);
t=0;
}
}
t=0;
}
}
@@
-1077,7
+1112,7
@@
SWFFont::~SWFFont()
if(usednum && !drawonlyshapes)
{
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);
TAG*ftag = swf_InsertTag(swf.firstTag,ST_DEFINEFONT);
swf_SetU16(ftag, this->swfid);
int initpos = swf_GetTagLen(ftag);
@@
-1136,7
+1171,8
@@
SWFFont::~SWFFont()
}
free(ptr);
}
free(ptr);
- free(outline);
+ if(outline)
+ free(outline);
for(t=0;t<charnum;t++)
free(charname[t]);
for(t=0;t<standardtablesize;t++)
for(t=0;t<charnum;t++)
free(charname[t]);
for(t=0;t<standardtablesize;t++)
@@
-1170,10
+1206,10
@@
T1_OUTLINE*SWFFont::getOutline(char*name, int charnr)
/* 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) {
/* 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;
}
return 0;
}
@@
-1209,10
+1245,10
@@
int SWFFont::getSWFCharID(char*name, int charnr)
/* 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) {
/* 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)
}
int SWFFont::getWidth(char*name)
@@
-1258,7
+1294,7
@@
void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filenam
}
if(t1id<0) {
}
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);
}
SWFFont*font = new SWFFont(fontid, t1id, filename);
@@
-1326,7
+1362,7
@@
void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _size
sizex = _sizex;
sizey = _sizey;
sizex = _sizex;
sizey = _sizey;
- 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;
obj->font = 0;
@@
-1494,7
+1530,7
@@
void swfoutput_destroy(struct swfoutput* obj)
fi = 1; // stdout
if(fi<=0) {
fi = 1; // stdout
if(fi<=0) {
- logf("<fatal> Could not create \"%s\". ", FIXNULL(filename));
+ msg("<fatal> Could not create \"%s\". ", FIXNULL(filename));
exit(1);
}
exit(1);
}
@@
-1502,15
+1538,15
@@
void swfoutput_destroy(struct swfoutput* obj)
if(enablezlib) {
if FAILED(swf_WriteSWC(fi,&swf))
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))
} else {
if FAILED(swf_WriteSWF(fi,&swf))
- logf("<error> WriteSWF() failed.\n");
+ msg("<error> WriteSWF() failed.\n");
}
if(filename)
close(fi);
}
if(filename)
close(fi);
- logf("<notice> SWF written\n");
+ msg("<notice> SWF written\n");
}
void swfoutput_setdrawmode(swfoutput* obj, int mode)
}
void swfoutput_setdrawmode(swfoutput* obj, int mode)
@@
-1578,7
+1614,7
@@
void swfoutput_startclip(swfoutput*obj, T1_OUTLINE*outline, struct swfmatrix*m)
if(clippos >= 127)
{
if(clippos >= 127)
{
- logf("<warning> Too many clip levels.");
+ msg("<warning> Too many clip levels.");
clippos --;
}
clippos --;
}
@@
-1605,7
+1641,7
@@
void swfoutput_endclip(swfoutput*obj)
endshape();
if(!clippos) {
endshape();
if(!clippos) {
- logf("<error> Invalid end of clipping region");
+ msg("<error> Invalid end of clipping region");
return;
}
clippos--;
return;
}
clippos--;