git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8475af
)
fix for zero font ids
author
Matthias Kramm
<kramm@quiss.org>
Mon, 22 Mar 2010 22:54:53 +0000
(15:54 -0700)
committer
Matthias Kramm
<kramm@quiss.org>
Mon, 22 Mar 2010 22:54:53 +0000
(15:54 -0700)
lib/filters/remove_font_transforms.c
patch
|
blob
|
history
diff --git
a/lib/filters/remove_font_transforms.c
b/lib/filters/remove_font_transforms.c
index
06b6300
..
c94ee94
100644
(file)
--- a/
lib/filters/remove_font_transforms.c
+++ b/
lib/filters/remove_font_transforms.c
@@
-150,7
+150,9
@@
static void pass1_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
{
internal_t*i = (internal_t*)f->internal;
mymatrix_t m;
{
internal_t*i = (internal_t*)f->internal;
mymatrix_t m;
- matrix_convert(matrix, font->id, &m, 0);
+ if(!font->id)
+ msg("<error> Font has no ID");
+ matrix_convert(matrix, font->id?font->id:"unknown", &m, 0);
transformedfont_t*fd = dict_lookup(i->matrices, &m);
if(!fd) {
fd = transformedfont_new(font, &m);
transformedfont_t*fd = dict_lookup(i->matrices, &m);
if(!fd) {
fd = transformedfont_new(font, &m);
@@
-251,7
+253,7
@@
static void pass2_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
mymatrix_t m;
gfxmatrix_t scalematrix;
mymatrix_t m;
gfxmatrix_t scalematrix;
- matrix_convert(matrix, font->id, &m, &scalematrix);
+ matrix_convert(matrix, font->id?font->id:"unknown", &m, &scalematrix);
transformedfont_t*d = dict_lookup(i->matrices, &m);
scalematrix.tx -= d->dx*scalematrix.m00;
out->drawchar(out, d->font, d->used[glyphnr], color, &scalematrix);
transformedfont_t*d = dict_lookup(i->matrices, &m);
scalematrix.tx -= d->dx*scalematrix.m00;
out->drawchar(out, d->font, d->used[glyphnr], color, &scalematrix);