ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-14 00:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed possibly placing a font glyph (at the beginning of a row) past the bottom of a font cache image.

Browse source
This commit is contained in:
Zack Middleton 2012-03-29 05:15:46 +00:00
parent f15a3cca21
commit 94fb80f021
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/renderer/tr_font.c
View file

@ -233,17 +233,11 @@ static glyphInfo_t *RE_ConstructGlyphInfo(unsigned char *imageOut, int *xOut, in
// we need to make sure we fit // we need to make sure we fit
if (*xOut + scaled_width + 1 >= 255) { if (*xOut + scaled_width + 1 >= 255) {
if (*yOut + *maxHeight + 1 >= 255) {
*yOut = -1;
*xOut = -1;
ri.Free(bitmap->buffer);
ri.Free(bitmap);
return &glyph;
} else {
*xOut = 0; *xOut = 0;
*yOut += *maxHeight + 1; *yOut += *maxHeight + 1;
} }
} else if (*yOut + *maxHeight + 1 >= 255) {
if (*yOut + *maxHeight + 1 >= 255) {
*yOut = -1; *yOut = -1;
*xOut = -1; *xOut = -1;
ri.Free(bitmap->buffer); ri.Free(bitmap->buffer);