bug 635451 - don't reject glyph index 31 in type-1 fonts. r=jdaggett …

…a=joe
leto · Feb 22, 2011 · 64909ee · 64909ee
1 parent f5134f8
commit 64909ee
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp
@@ -327,7 +327,8 @@ GDIFontEntry::FillLogFont(LOGFONTW *aLogFont, PRBool aItalic,
     aLogFont->lfQuality        = (aUseCleartype ? CLEARTYPE_QUALITY : DEFAULT_QUALITY);
 }
 
-#define MISSING_GLYPH 0x1F
+#define MISSING_GLYPH 0x1F // glyph index returned for missing characters
+                           // on WinXP with .fon fonts, but not Type1 (.pfb)
 
 PRBool 
 GDIFontEntry::TestCharacterMap(PRUint32 aCh)
@@ -376,8 +377,8 @@ GDIFontEntry::TestCharacterMap(PRUint32 aCh)
             DWORD ret = GetGlyphIndicesW(dc, str, 1, 
                                          glyph, GGI_MARK_NONEXISTING_GLYPHS);
             if (ret != GDI_ERROR
-                && glyph[0] != 0xFFFF 
-                && glyph[0] != MISSING_GLYPH)
+                && glyph[0] != 0xFFFF
+                && (IsType1() || glyph[0] != MISSING_GLYPH))
             {
                 hasGlyph = PR_TRUE;
             }