Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Don't discard empty glyphs, just skip them 

A space is encoded as a 1x1 blank glyph, but we still need to advance by
its character width and so we cannot simply discard the glyph.

References: https://bugs.freedesktop.org/show_bug.cgi?id=44091id=44091
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-12-27 15:26:46 +00:00
parent 726290ea2a
commit 8fc21328a0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sna/sna_accel.c
View File

@ -7786,6 +7786,9 @@ sna_glyph_blt(DrawablePtr drawable, GCPtr gc,
int w8 = (w + 7) >> 3;
int x1, y1, len;
if (c->bits == (void *)1)
goto skip;
len = (w8 * h + 7) >> 3 << 1;
DBG(("%s glyph: (%d, %d) x (%d[%d], %d), len=%d\n" ,__FUNCTION__,
x,y, w, w8, h, len));
@ -7920,9 +7923,9 @@ static bool sna_set_glyph(CharInfoPtr in, CharInfoPtr out)
}
/* Skip empty glyphs */
if (w == 1 && h == 1 && (in->bits[0] & 1) == 0) {
out->bits = (void *)-1;
return false;
if ((w|h) == 1 && (in->bits[0] & 1) == 0) {
out->bits = (void *)1;
return true;
}
w = (w + 7) >> 3;