git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bounding boxes are not required to start at zero anymore.
[swftools.git]
/
pdf2swf
/
swfoutput.cc
diff --git
a/pdf2swf/swfoutput.cc
b/pdf2swf/swfoutput.cc
index
0ad1432
..
6285081
100644
(file)
--- a/
pdf2swf/swfoutput.cc
+++ b/
pdf2swf/swfoutput.cc
@@
-899,6
+899,11
@@
static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha
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)
@@
-912,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) {
- msg("<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;
}
@@
-991,13
+996,18
@@
SWFFont::SWFFont(char*name, int id, char*filename)
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;
+ if(!charnum) {
+ this->standardtablesize = 0;
+ }
msg("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
this->standardtablesize = 256;
msg("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
this->standardtablesize = 256;
@@
-1007,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*));
@@
-1152,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++)
@@
-1186,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;
}
}
- msg("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
return 0;
}
return 0;
}
@@
-1225,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;
}
}
- msg("<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)
@@
-1332,15
+1352,15
@@
void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character,
}
/* initialize the swf writer */
}
/* 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;
{
GLYPH *glyph;
RGBA rgb;
SRECT r;
memset(obj, 0, sizeof(struct swfoutput));
filename = _filename;
- sizex = _sizex;
- sizey = _sizey;
+ sizex = x2;
+ sizey = y2;
msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
@@
-1350,8
+1370,10
@@
void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _size
swf.fileVersion = flashversion;
swf.frameRate = 0x0040; // 1 frame per 4 seconds
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;
swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
tag = swf.firstTag;
swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
tag = swf.firstTag;
@@
-1359,8
+1381,10
@@
void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _size
rgb.g = 0xff;
rgb.b = 0xff;
swf_SetRGB(tag,&rgb);
rgb.g = 0xff;
rgb.b = 0xff;
swf_SetRGB(tag,&rgb);
- if(flag_protected) // good practice! /r
+
+ if(flag_protected)
tag = swf_InsertTag(tag, ST_PROTECT);
tag = swf_InsertTag(tag, ST_PROTECT);
+
depth = 1;
startdepth = depth;
}
depth = 1;
startdepth = depth;
}