Fix a bug in the intersection computation that could concievably cause

incorrect results to be returned (but would probably usually be
    over-conservative).
This commit is contained in:
Eric Anholt 2006-04-26 01:32:55 +00:00
parent 5d00859c6e
commit eaed7545a2
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2006-04-25 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_render.c: (exaGlyphsIntersect):
Fix a bug in the intersection computation that could concievably cause
incorrect results to be returned (but would probably usually be
over-conservative).
2006-04-25 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_render.c: (exaGlyphsIntersect), (exaGlyphs):

View File

@ -643,8 +643,11 @@ exaGlyphsIntersect(int nlist, GlyphListPtr list, GlyphPtr *glyphs)
while (n--) {
glyph = *glyphs++;
if (glyph->info.width == 0 || glyph->info.height == 0)
if (glyph->info.width == 0 || glyph->info.height == 0) {
x += glyph->info.xOff;
y += glyph->info.yOff;
continue;
}
x1 = x - glyph->info.x;
if (x1 < MINSHORT)