diff options
Diffstat (limited to 'src/w32uniscribe.c')
| -rw-r--r-- | src/w32uniscribe.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index f6347bb88f7..5e5c8e88b2b 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Font backend for the Microsoft W32 Uniscribe API. | 1 | /* Font backend for the Microsoft W32 Uniscribe API. |
| 2 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -469,7 +469,7 @@ uniscribe_encode_char (struct font *font, int c) | |||
| 469 | 469 | ||
| 470 | /* Non BMP characters must be handled by the uniscribe shaping | 470 | /* Non BMP characters must be handled by the uniscribe shaping |
| 471 | engine as GDI functions (except blindly displaying lines of | 471 | engine as GDI functions (except blindly displaying lines of |
| 472 | unicode text) and the promising looking ScriptGetCMap do not | 472 | Unicode text) and the promising looking ScriptGetCMap do not |
| 473 | convert surrogate pairs to glyph indexes correctly. */ | 473 | convert surrogate pairs to glyph indexes correctly. */ |
| 474 | { | 474 | { |
| 475 | items = (SCRIPT_ITEM *) alloca (sizeof (SCRIPT_ITEM) * 2 + 1); | 475 | items = (SCRIPT_ITEM *) alloca (sizeof (SCRIPT_ITEM) * 2 + 1); |
| @@ -507,7 +507,7 @@ uniscribe_encode_char (struct font *font, int c) | |||
| 507 | if (SUCCEEDED (result) && nglyphs == 1) | 507 | if (SUCCEEDED (result) && nglyphs == 1) |
| 508 | { | 508 | { |
| 509 | /* Some fonts return .notdef glyphs instead of failing. | 509 | /* Some fonts return .notdef glyphs instead of failing. |
| 510 | (Truetype spec reserves glyph code 0 for .notdef) */ | 510 | (TrueType spec reserves glyph code 0 for .notdef) */ |
| 511 | if (glyphs[0]) | 511 | if (glyphs[0]) |
| 512 | code = glyphs[0]; | 512 | code = glyphs[0]; |
| 513 | } | 513 | } |
| @@ -581,7 +581,7 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font, | |||
| 581 | && font_type != TRUETYPE_FONTTYPE) | 581 | && font_type != TRUETYPE_FONTTYPE) |
| 582 | return 1; | 582 | return 1; |
| 583 | 583 | ||
| 584 | /* Skip fonts that have no unicode coverage. */ | 584 | /* Skip fonts that have no Unicode coverage. */ |
| 585 | if (!physical_font->ntmFontSig.fsUsb[3] | 585 | if (!physical_font->ntmFontSig.fsUsb[3] |
| 586 | && !physical_font->ntmFontSig.fsUsb[2] | 586 | && !physical_font->ntmFontSig.fsUsb[2] |
| 587 | && !physical_font->ntmFontSig.fsUsb[1] | 587 | && !physical_font->ntmFontSig.fsUsb[1] |
| @@ -961,4 +961,3 @@ syms_of_w32uniscribe (void) | |||
| 961 | 961 | ||
| 962 | register_font_driver (&uniscribe_font_driver, NULL); | 962 | register_font_driver (&uniscribe_font_driver, NULL); |
| 963 | } | 963 | } |
| 964 | |||