# HG changeset patch # User Jason Rumney # Date 1198103266 0 # Node ID 51863d34f0f1bc078fdb8c071d64dec8f514b6d1 # Parent 5e8f33ad8f6327b3375724b7dc909784939fbf5f (w32font_open): Remove debug code. (w32font_match_internal, w32_font_open_internal): Remove experimental change. Last checkin should have had the following comment: (w32font_text_extents): Don't use the frame stored in the font, as it may have been deleted. diff -r 5e8f33ad8f63 -r 51863d34f0f1 src/w32font.c --- a/src/w32font.c Wed Dec 19 22:22:55 2007 +0000 +++ b/src/w32font.c Wed Dec 19 22:27:46 2007 +0000 @@ -203,8 +203,6 @@ if (w32_font == NULL) return NULL; - safe_debug_print (font_entity); - if (!w32font_open_internal (f, font_entity, pixel_size, w32_font)) { xfree (w32_font); @@ -610,10 +608,6 @@ bzero (&match_data.pattern, sizeof (LOGFONT)); fill_in_logfont (f, &match_data.pattern, font_spec); - /* If weight was not specified, try to get a normal weight font. */ - if (!match_data.pattern.lfWeight) - match_data.pattern.lfWeight = FW_NORMAL; - match_data.opentype_only = opentype_only; if (opentype_only) match_data.pattern.lfOutPrecision = OUT_OUTLINE_PRECIS; @@ -650,10 +644,6 @@ bzero (&logfont, sizeof (logfont)); fill_in_logfont (f, &logfont, font_entity); - /* If weight was not specified, try to get a normal weight font. */ - if (!logfont.lfWeight) - logfont.lfWeight = FW_NORMAL; - size = XINT (AREF (font_entity, FONT_SIZE_INDEX)); if (!size) size = pixel_size;