mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed multiple crashes in font handling

This commit is contained in:
vurtun 2016-08-03 16:22:13 +02:00
parent 8d5c479db2
commit b251f91107
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nuklear.h
View File

@ -8960,7 +8960,7 @@ nk_font_bake_pack(struct nk_font_baker *baker,
/* setup font baker from temporary memory */
for (config_iter = config_list; config_iter; config_iter = config_iter->next) {
const struct nk_font_config *cfg = config_iter;
if (!nk_tt_InitFont(&baker->build[i].info, (const unsigned char*)cfg->ttf_blob, 0))
if (!nk_tt_InitFont(&baker->build[i++].info, (const unsigned char*)cfg->ttf_blob, 0))
return nk_false;
}
@ -9306,7 +9306,6 @@ nk_font_init(struct nk_font *font, float pixel_height,
return;
baked = *baked_font;
nk_zero(font, sizeof(*font));
font->info = baked;
font->scale = (float)pixel_height / (float)font->info.height;
font->glyphs = &glyphs[baked_font->glyph_offset];