AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 03:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix fonts leaking file handles

Browse Source
This commit is contained in:
UnknownShadow200 2019-02-11 22:46:51 +11:00
parent f6e3478eed
commit 1b8210c7ca
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Platform.c
View File

@ -884,6 +884,29 @@ static unsigned long FontData_Read(FT_Stream s, unsigned long offset, unsigned c
return res ? 0 : count; return res ? 0 : count;
} }
static void FontData_Free(struct FontData* font) {
int i;
/* Close the actual underlying file */
struct Stream* source = &font->file;
if (!source->Meta.File) return;
source->Close(source);
for (i = 0; i < 256; i++) {
if (!font->glyphs[i]) continue;
FT_Done_Glyph(font->glyphs[i]);
}
for (i = 0; i < 256; i++) {
if (!font->shadow_glyphs[i]) continue;
FT_Done_Glyph(font->shadow_glyphs[i]);
}
}
static void FontData_Close(FT_Stream stream) {
struct FontData* data = stream->descriptor.pointer;
FontData_Free(data);
}
static bool FontData_Init(const String* path, struct FontData* data, FT_Open_Args* args) { static bool FontData_Init(const String* path, struct FontData* data, FT_Open_Args* args) {
FileHandle file; FileHandle file;
uint32_t size; uint32_t size;
@ -897,7 +920,7 @@ static bool FontData_Init(const String* path, struct FontData* data, FT_Open_Arg
data->stream.descriptor.pointer = data; data->stream.descriptor.pointer = data;
data->stream.read = FontData_Read; data->stream.read = FontData_Read;
data->stream.close = NULL; data->stream.close = FontData_Close;
data->stream.memory = &ft_mem; data->stream.memory = &ft_mem;
data->stream.cursor = NULL; data->stream.cursor = NULL;
@ -923,22 +946,6 @@ static bool FontData_Init(const String* path, struct FontData* data, FT_Open_Arg
return true; return true;
} }
static void FontData_Free(struct FontData* font) {
int i;
/* Close the actual file stream */
struct Stream* source = &font->file;
source->Close(source);
for (i = 0; i < 256; i++) {
if (!font->glyphs[i]) continue;
FT_Done_Glyph(font->glyphs[i]);
}
for (i = 0; i < 256; i++) {
if (!font->shadow_glyphs[i]) continue;
FT_Done_Glyph(font->shadow_glyphs[i]);
}
}
void Font_GetNames(StringsBuffer* buffer) { void Font_GetNames(StringsBuffer* buffer) {
String entry, name, path; String entry, name, path;
int i; int i;
@ -1067,7 +1074,6 @@ static int Font_Register(const String* path, int faceIndex) {
} }
FT_Done_Face(data.face); FT_Done_Face(data.face);
FontData_Free(&data);
return count; return count;
} }