duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add better error-handling to Font.cpp

Browse source 
Co-authored-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Clownacy 2019-11-09 14:19:26 +00:00
parent 319e416592
commit 3c9ff22c22
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Font.cpp
View file

@ -965,7 +965,7 @@ static CachedGlyph* GetGlyphCached(FontObject *font_object, unsigned long unicod
glyph = (CachedGlyph*)malloc(sizeof(CachedGlyph)); glyph = (CachedGlyph*)malloc(sizeof(CachedGlyph));
if (glyph) if (glyph != NULL)
{ {
glyph->next = font_object->glyph_list_head; glyph->next = font_object->glyph_list_head;
font_object->glyph_list_head = glyph; font_object->glyph_list_head = glyph;
@ -1055,25 +1055,22 @@ FontObject* LoadFontFromData(const unsigned char *data, size_t data_size, unsign
{ {
FontObject *font_object = (FontObject*)malloc(sizeof(FontObject)); FontObject *font_object = (FontObject*)malloc(sizeof(FontObject));
FT_Init_FreeType(&font_object->library); if (font_object != NULL)
{
if (FT_Init_FreeType(&font_object->library) == 0)
{
#ifndef DISABLE_FONT_ANTIALIASING #ifndef DISABLE_FONT_ANTIALIASING
font_object->lcd_mode = Backend_SupportsSubpixelGlyphs() && FT_Library_SetLcdFilter(font_object->library, FT_LCD_FILTER_DEFAULT) != FT_Err_Unimplemented_Feature; font_object->lcd_mode = Backend_SupportsSubpixelGlyphs() && FT_Library_SetLcdFilter(font_object->library, FT_LCD_FILTER_DEFAULT) != FT_Err_Unimplemented_Feature;
#endif #endif
font_object->data = (unsigned char*)malloc(data_size); font_object->data = (unsigned char*)malloc(data_size);
if (font_object->data != NULL)
{
memcpy(font_object->data, data, data_size); memcpy(font_object->data, data, data_size);
FT_Error error = FT_New_Memory_Face(font_object->library, font_object->data, (FT_Long)data_size, 0, &font_object->face); if (FT_New_Memory_Face(font_object->library, font_object->data, (FT_Long)data_size, 0, &font_object->face) == 0)
if (error)
{ {
free(font_object->data);
FT_Done_FreeType(font_object->library);
free(font_object);
return NULL;
}
#ifdef JAPANESE #ifdef JAPANESE
cell_width = 0; // Cheap hack to make the font square cell_width = 0; // Cheap hack to make the font square
#endif #endif
@ -1083,6 +1080,18 @@ FontObject* LoadFontFromData(const unsigned char *data, size_t data_size, unsign
font_object->glyph_list_head = NULL; font_object->glyph_list_head = NULL;
return font_object; return font_object;
}
free(font_object->data);
}
FT_Done_FreeType(font_object->library);
}
free(font_object);
}
return NULL;
} }
FontObject* LoadFont(const char *font_filename, unsigned int cell_width, unsigned int cell_height) FontObject* LoadFont(const char *font_filename, unsigned int cell_width, unsigned int cell_height)