mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated font.c for latest libnx + minor other changes.

Browse Source
This commit is contained in:
yellows8 2019-10-11 01:49:28 -04:00
parent 2feb085504
commit a150cbe167
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/font.c
View File

@ -14,11 +14,11 @@ static FT_Error s_font_libret=1, s_font_facesret[FONT_FACES_MAX];
static FT_Library s_font_library; static FT_Library s_font_library;
static FT_Face s_font_faces[FONT_FACES_MAX]; static FT_Face s_font_faces[FONT_FACES_MAX];
static FT_Face s_font_lastusedface; static FT_Face s_font_lastusedface;
static size_t s_font_faces_total = 0; static s32 s_font_faces_total = 0;
static bool FontSetType(u32 font) static bool FontSetType(u32 font)
{ {
u32 i=0; s32 i=0;
u32 scale=0; u32 scale=0;
FT_Error ret=0; FT_Error ret=0;
@ -80,12 +80,12 @@ static bool FontSetType(u32 font)
static inline bool FontLoadGlyph(glyph_t* glyph, u32 font, uint32_t codepoint) static inline bool FontLoadGlyph(glyph_t* glyph, u32 font, uint32_t codepoint)
{ {
FT_Face face; FT_Face face=0;
FT_Error ret=0; FT_Error ret=0;
FT_GlyphSlot slot; FT_GlyphSlot slot;
FT_UInt glyph_index; FT_UInt glyph_index;
FT_Bitmap* bitmap; FT_Bitmap* bitmap;
u32 i=0; s32 i=0;
//__builtin_printf("LoadGlyph %u\n", (unsigned int)codepoint); //__builtin_printf("LoadGlyph %u\n", (unsigned int)codepoint);
/*const ffnt_page_t* page = FontGetPage(font, codepoint >> 8); /*const ffnt_page_t* page = FontGetPage(font, codepoint >> 8);
@ -320,7 +320,7 @@ void GetTextDimensions(u32 font, const char* text, uint32_t* width_out, uint32_t
bool fontInitialize(void) bool fontInitialize(void)
{ {
FT_Error ret=0; FT_Error ret=0;
u32 i; s32 i;
for (i=0; i<FONT_FACES_MAX; i++) s_font_facesret[i] = 1; for (i=0; i<FONT_FACES_MAX; i++) s_font_facesret[i] = 1;
@ -372,7 +372,7 @@ bool fontInitialize(void)
void fontExit() void fontExit()
{ {
u32 i=0; s32 i=0;
for (i=0; i<s_font_faces_total; i++) for (i=0; i<s_font_faces_total; i++)
if (s_font_facesret[i]==0) FT_Done_Face(s_font_faces[i]); if (s_font_facesret[i]==0) FT_Done_Face(s_font_faces[i]);