Mercurial > emacs
comparison src/w32font.c @ 97243:3c62347bccdb
(compute_metrics): Don't mess with glyph_idx setting here.
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Sat, 02 Aug 2008 21:26:08 +0000 |
parents | 09abb4487286 |
children | 528e53849f51 |
comparison
equal
deleted
inserted
replaced
97242:cc5f94eeb1d8 | 97243:3c62347bccdb |
---|---|
2263 metrics->lbearing = gm.gmptGlyphOrigin.x; | 2263 metrics->lbearing = gm.gmptGlyphOrigin.x; |
2264 metrics->rbearing = gm.gmptGlyphOrigin.x + gm.gmBlackBoxX; | 2264 metrics->rbearing = gm.gmptGlyphOrigin.x + gm.gmBlackBoxX; |
2265 metrics->width = gm.gmCellIncX; | 2265 metrics->width = gm.gmCellIncX; |
2266 metrics->status = W32METRIC_SUCCESS; | 2266 metrics->status = W32METRIC_SUCCESS; |
2267 } | 2267 } |
2268 else if (w32_font->glyph_idx) | |
2269 { | |
2270 /* Can't use glyph indexes after all. | |
2271 Avoid it in future, and clear any metrics that were based on | |
2272 glyph indexes. */ | |
2273 w32_font->glyph_idx = 0; | |
2274 clear_cached_metrics (w32_font); | |
2275 } | |
2276 else | 2268 else |
2277 metrics->status = W32METRIC_FAIL; | 2269 metrics->status = W32METRIC_FAIL; |
2278 } | 2270 } |
2279 | 2271 |
2280 static void | 2272 static void |