Fix font size handling.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a356bb81aa06707476a5da52078225fff528a9f..f9c158115473b47f2637b1f6499cffb62a1a379f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-22  Kenichi Handa  <handa@m17n.org>
+
+       * font.c (font_open_entity): Be sure to set scaled_pixel_size.
+       (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
+       integer.
+
 2011-02-19  Chong Yidong  <cyd@stupidchicken.com>
 
        * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.

diff --git a/src/font.c b/src/font.c
index ebf0b547b9f5f7955c30f58c86a4f46ec6edec76..08309d3697b098ac3954d216583e74dd03c1fed8 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3042,7 +3042,7 @@ font_open_entity (f, entity, pixel_size)
   Lisp_Object objlist, size, val, font_object;
   struct font *font;
   int min_width, height;
-  int scaled_pixel_size;
+  int scaled_pixel_size = pixel_size;
 
   font_assert (FONT_ENTITY_P (entity));
   size = AREF (entity, FONT_SIZE_INDEX);
@@ -3422,7 +3422,7 @@ font_find_for_lface (f, attrs, spec, c)
   XSETFRAME (frame, f);
   size = AREF (spec, FONT_SIZE_INDEX);
   pixel_size = font_pixel_size (f, spec);
-  if (pixel_size == 0)
+  if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
     {
       double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);