From: handa <handa>
Date: Wed, 24 Aug 2005 05:41:08 +0000 (+0000)
Subject: Fix handling of ratio.
X-Git-Tag: REL-1-3-0~232
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60452a0c3df0983f381ded76e95de254e57d86a6;p=m17n%2Fm17n-lib.git

Fix handling of ratio.
---

diff --git a/src/face.c b/src/face.c
index 931ec39..36ce285 100644
--- a/src/face.c
+++ b/src/face.c
@@ -645,14 +645,16 @@ mface__realize (MFrame *frame, MFace **faces, int num, int size, MFont *font)
       mplist_push (faces[i]->frame_list, Mt, frame);
 
   if ((int) merged_face.property[MFACE_SIZE] < 0
-      || (int) merged_face.property[MFACE_RATIO] != 100)
+      || (merged_face.property[MFACE_RATIO]
+	  && (int) merged_face.property[MFACE_RATIO] != 100))
     {
       double font_size = (int) merged_face.property[MFACE_SIZE];
       int ifont_size;
 
       if (font_size < 0)
 	font_size = - font_size * frame->dpi / 72.27;
-      if ((int) merged_face.property[MFACE_RATIO] != 100)
+      if (merged_face.property[MFACE_RATIO]
+	  && (int) merged_face.property[MFACE_RATIO] != 100)
 	{
 	  font_size *= (int) merged_face.property[MFACE_RATIO];
 	  font_size /= 100;