* w32font.c (w32font_open): Set font type to gdi.
authorJason Rumney <jasonr@gnu.org>
Wed, 23 Jul 2008 15:37:44 +0000 (15:37 +0000)
committerJason Rumney <jasonr@gnu.org>
Wed, 23 Jul 2008 15:37:44 +0000 (15:37 +0000)
* w32uniscribe.c (uniscribe_open): Set font type to uniscribe.

src/ChangeLog
src/w32font.c
src/w32uniscribe.c

index 019c5f0..6640bca 100644 (file)
@@ -2,6 +2,9 @@
 
         * w32font.c (w32_enumfont_pattern_entity): Return height consistent
         with opened font.
+        (w32font_open): Set font type to gdi.
+
+        * w32uniscribe.c (uniscribe_open): Set font type to uniscribe.
 
 2008-07-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
index 45d5742..77e949a 100644 (file)
@@ -238,6 +238,7 @@ w32font_open (f, font_entity, pixel_size)
 
   font_object = font_make_object (VECSIZE (struct w32font_info),
                                  font_entity, pixel_size);
+  ASET (font_object, FONT_TYPE_INDEX, Qgdi);
 
   if (!w32font_open_internal (f, font_entity, pixel_size, font_object))
     {
index 8fb7eb6..0e0a4e8 100644 (file)
@@ -125,6 +125,8 @@ uniscribe_open (f, font_entity, pixel_size)
   struct uniscribe_font_info *uniscribe_font
     = (struct uniscribe_font_info *) XFONT_OBJECT (font_object);
 
+  ASET (font_object, FONT_TYPE_INDEX, Quniscribe);
+
   if (!w32font_open_internal (f, font_entity, pixel_size, font_object))
     {
       return Qnil;