comparison src/fontset.c @ 40028:392c2fe9edd7

(fs_load_font) [WINDOWSNT && _MSC_VER]: Disable optimization. The fontp->encoding array was not being initialized correctly when compiled with optimizations by MSVC.
author Andrew Innes <andrewi@gnu.org>
date Thu, 18 Oct 2001 16:22:55 +0000
parents 579177964efa
children cdfd4d09b79a
comparison
equal deleted inserted replaced
40027:d081f5779c98 40028:392c2fe9edd7
567 return font_family_registry (build_string (fontp->full_name), 567 return font_family_registry (build_string (fontp->full_name),
568 SINGLE_BYTE_CHAR_P (c)); 568 SINGLE_BYTE_CHAR_P (c));
569 } 569 }
570 570
571 571
572 #if defined(WINDOWSNT) && defined (_MSC_VER)
573 #pragma optimize("", off)
574 #endif
575
572 /* Load a font named FONTNAME to display character C on frame F. 576 /* Load a font named FONTNAME to display character C on frame F.
573 Return a pointer to the struct font_info of the loaded font. If 577 Return a pointer to the struct font_info of the loaded font. If
574 loading fails, return NULL. If FACE is non-zero and a fontset is 578 loading fails, return NULL. If FACE is non-zero and a fontset is
575 assigned to it, record FACE->id in the fontset for C. If FONTNAME 579 assigned to it, record FACE->id in the fontset for C. If FONTNAME
576 is NULL, the name is taken from the fontset of FACE or what 580 is NULL, the name is taken from the fontset of FACE or what
691 && !NILP (fontset) 695 && !NILP (fontset)
692 && !BASE_FONTSET_P (fontset)) 696 && !BASE_FONTSET_P (fontset))
693 FONTSET_SET (fontset, c, make_number (face->id)); 697 FONTSET_SET (fontset, c, make_number (face->id));
694 return fontp; 698 return fontp;
695 } 699 }
700
701 #if defined(WINDOWSNT) && defined (_MSC_VER)
702 #pragma optimize("", on)
703 #endif
696 704
697 705
698 /* Cache data used by fontset_pattern_regexp. The car part is a 706 /* Cache data used by fontset_pattern_regexp. The car part is a
699 pattern string containing at least one wild card, the cdr part is 707 pattern string containing at least one wild card, the cdr part is
700 the corresponding regular expression. */ 708 the corresponding regular expression. */