From: handa <handa>
Date: Tue, 15 Jan 2008 06:47:49 +0000 (+0000)
Subject: (ft_drive_otf): Don't refer to otf_gstring if HAVE_OTF
X-Git-Tag: REL-1-5-1~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5e0d8fc117b1b96a7df9058f20c32b31c0289554;p=m17n%2Fm17n-lib.git

(ft_drive_otf): Don't refer to otf_gstring if HAVE_OTF
is not defined.
---

diff --git a/src/font-ft.c b/src/font-ft.c
index 09b651a..913292b 100644
--- 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;
 }