From: handa <handa>
Date: Thu, 31 Jan 2008 00:31:43 +0000 (+0000)
Subject: (mdraw_glyph_list): Refer to mfont__ft_driver only when
X-Git-Tag: REL-1-5-1~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b0ef63ba9b191d0952c7615fda75cce722a610b0;p=m17n%2Fm17n-lib.git

(mdraw_glyph_list): Refer to mfont__ft_driver only when
HAVE_FREETYPE is defined.
---

diff --git a/src/draw.c b/src/draw.c
index c44000b..a356883 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -2733,10 +2733,14 @@ mdraw_glyph_list (MFrame *frame, MText *mt, int from, int to,
 	  if (g->rface->rfont)
 	    {
 	      glyphs->font = (MFont *) g->rface->rfont;
+#ifdef HAVE_FREETYPE
 	      glyphs->font_type
 		= (glyphs->font->source == MFONT_SOURCE_X ? Mx
 		   : g->rface->rfont->driver == &mfont__ft_driver ? Mfreetype
 		   : Mxft);
+#else  /* not HAVE_FREETYPE */
+	      glyphs->font_type = Mx;
+#endif	/* not HAVE_FREETYPE */
 	      glyphs->fontp = g->rface->rfont->fontp;
 	    }
 	  else