ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some issues found using clang static analyzer.

This commit is contained in:
Zack Middleton 2012-04-07 02:53:42 +00:00
parent ce3ec3ceef
commit a55a059abc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/renderer/tr_font.c
View File

@ -290,10 +290,10 @@ static glyphInfo_t *RE_ConstructGlyphInfo(unsigned char *imageOut, int *xOut, in
glyph.t2 = glyph.t + (float)scaled_height / 256; glyph.t2 = glyph.t + (float)scaled_height / 256;
*xOut += scaled_width + 1; *xOut += scaled_width + 1;
}
ri.Free(bitmap->buffer); ri.Free(bitmap->buffer);
ri.Free(bitmap); ri.Free(bitmap);
}
return &glyph; return &glyph;
} }
@ -340,13 +340,12 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
image_t *image; image_t *image;
qhandle_t h; qhandle_t h;
float max; float max;
float glyphScale;
#endif #endif
void *faceData; void *faceData;
int i, len; int i, len;
char name[1024]; char name[1024];
float dpi = 72; // float dpi = 72;
float glyphScale = 72.0f / dpi; // change the scale to be relative to 1 based on 72 dpi ( so dpi of 144 means a scale of .5 )
if (!fontName) { if (!fontName) {
ri.Printf(PRINT_ALL, "RE_RegisterFont: called with empty name\n"); ri.Printf(PRINT_ALL, "RE_RegisterFont: called with empty name\n");
@ -356,8 +355,6 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
if (pointSize <= 0) { if (pointSize <= 0) {
pointSize = 12; pointSize = 12;
} }
// we also need to adjust the scale based on point size relative to 48 points as the ui scaling is based on a 48 point font
glyphScale *= 48.0f / pointSize;
// make sure the render thread is stopped // make sure the render thread is stopped
R_SyncRenderThread(); R_SyncRenderThread();
@ -449,7 +446,7 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
maxHeight = 0; maxHeight = 0;
for (i = GLYPH_START; i < GLYPH_END; i++) { for (i = GLYPH_START; i < GLYPH_END; i++) {
glyph = RE_ConstructGlyphInfo(out, &xOut, &yOut, &maxHeight, face, (unsigned char)i, qtrue); RE_ConstructGlyphInfo(out, &xOut, &yOut, &maxHeight, face, (unsigned char)i, qtrue);
} }
xOut = 0; xOut = 0;
@ -514,6 +511,12 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
} }
} }
// change the scale to be relative to 1 based on 72 dpi ( so dpi of 144 means a scale of .5 )
glyphScale = 72.0f / dpi;
// we also need to adjust the scale based on point size relative to 48 points as the ui scaling is based on a 48 point font
glyphScale *= 48.0f / pointSize;
registeredFont[registeredFontCount].glyphScale = glyphScale; registeredFont[registeredFontCount].glyphScale = glyphScale;
font->glyphScale = glyphScale; font->glyphScale = glyphScale;
Com_Memcpy(&registeredFont[registeredFontCount++], font, sizeof(fontInfo_t)); Com_Memcpy(&registeredFont[registeredFontCount++], font, sizeof(fontInfo_t));