projects
/
m17n
/
m17n-lib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5a1464
)
(ft_drive_otf): Don't refer to otf_gstring if HAVE_OTF
author
handa
<handa>
Tue, 15 Jan 2008 06:47:49 +0000
(06:47 +0000)
committer
handa
<handa>
Tue, 15 Jan 2008 06:47:49 +0000
(06:47 +0000)
is not defined.
src/font-ft.c
patch
|
blob
|
history
diff --git
a/src/font-ft.c
b/src/font-ft.c
index
09b651a
..
913292b
100644
(file)
--- a/
src/font-ft.c
+++ b/
src/font-ft.c
@@
-2488,6
+2488,8
@@
ft_drive_otf (MFLTFont *font, MFLTOtfSpec *spec,
return to;
simple_copy:
+ if (otf_gstring.glyphs)
+ free (otf_gstring.glyphs);
#endif /* HAVE_OTF */
if (out->allocated < out->used + len)
return -2;
@@
-2495,8
+2497,6
@@
ft_drive_otf (MFLTFont *font, MFLTOtfSpec *spec,
memcpy ((MGlyph *)out->glyphs + out->used, (MGlyph *) in->glyphs + from,
sizeof (MGlyph) * len);
out->used += len;
- if (otf_gstring.glyphs)
- free (otf_gstring.glyphs);
return to;
}