# HG changeset patch # User Jason Rumney # Date 1211876981 0 # Node ID 48f990d65758e1412cd2b77cc58f48a3e461c89e # Parent b4a9f05bf87bc473896147a9a9ea1d70e9051b25 (w32font_open_internal): Determine if glyph indices are likely to work here. diff -r b4a9f05bf87b -r 48f990d65758 src/w32font.c --- a/src/w32font.c Tue May 27 05:36:03 2008 +0000 +++ b/src/w32font.c Tue May 27 08:29:41 2008 +0000 @@ -796,11 +796,16 @@ sizeof (TEXTMETRIC)); else metrics = NULL; + + /* If it supports outline metrics, it should support Glyph Indices. */ + w32_font->glyph_idx = ETO_GLYPH_INDEX; } + if (!metrics) - GetTextMetrics (dc, &w32_font->metrics); - - w32_font->glyph_idx = ETO_GLYPH_INDEX; + { + GetTextMetrics (dc, &w32_font->metrics); + w32_font->glyph_idx = 0; + } w32_font->cached_metrics = NULL; w32_font->n_cache_blocks = 0;