Author: spouliot
Date: 2007-11-01 06:40:22 -0500 (Thu, 01 Nov 2007)
New Revision: 88637

Modified:
   trunk/libgdiplus/src/ChangeLog
   trunk/libgdiplus/src/font.c
Log:
font.c: Fix font face selection (typo) and ensure the font-family doesn't cache 
a version without bold and/or italics. Fix #338207

Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog      2007-11-01 11:38:14 UTC (rev 88636)
+++ trunk/libgdiplus/src/ChangeLog      2007-11-01 11:40:22 UTC (rev 88637)
@@ -1,3 +1,8 @@
+2007-11-01  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * font.c: Fix font face selection (typo) and ensure the font-family
+       doesn't cache a version without bold and/or italics. Fix #338207
+
 2007-10-31  Sebastien Pouliot  <[EMAIL PROTECTED]> 
 
        * graphics-path.c: Avoid computing the start point coord unless we

Modified: trunk/libgdiplus/src/font.c
===================================================================
--- trunk/libgdiplus/src/font.c 2007-11-01 11:38:14 UTC (rev 88636)
+++ trunk/libgdiplus/src/font.c 2007-11-01 11:40:22 UTC (rev 88637)
@@ -620,7 +620,7 @@
                cairo_surface_t *surface = cairo_image_surface_create_for_data 
((BYTE*)NULL, CAIRO_FORMAT_ARGB32, 0, 0, 0);
                font->cairo = cairo_create (surface);
 
-               cairo_select_font_face (font->cairo, (const char *)font->family,
+               cairo_select_font_face (font->cairo, (const char *)font->face,
                        (font->style & FontStyleItalic) ? 
CAIRO_FONT_SLANT_ITALIC : CAIRO_FONT_SLANT_NORMAL,
                        (font->style & FontStyleBold) ? CAIRO_FONT_WEIGHT_BOLD 
: CAIRO_FONT_WEIGHT_NORMAL);
                font->cairofnt = cairo_get_font_face (font->cairo);
@@ -790,6 +790,7 @@
 #else
        result->cairofnt = NULL;
        result->cairo = NULL;
+       gdip_get_cairo_font_face (result);
 #endif
        *font = result;                         
        return Ok;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to