CXX_BUILD fixes

This commit is contained in:
twinaphex 2016-10-21 19:14:48 +02:00
parent 56d427df65
commit aca8970e79
2 changed files with 5 additions and 5 deletions

View File

@ -216,14 +216,14 @@ static void *font_renderer_ft_init(const char *font_path, float font_size)
/* TODO: find a better way to determine onmax_glyph_width/height */
handle->max_glyph_width = font_size;
handle->max_glyph_height = font_size;
handle->atlas.width = handle->max_glyph_width * 2 * FT_ATLAS_COLS;
handle->atlas.width = handle->max_glyph_width * 2 * FT_ATLAS_COLS;
handle->atlas.height = handle->max_glyph_height * 2 * FT_ATLAS_ROWS;
handle->atlas.buffer = (uint8_t*)
calloc(handle->atlas.width * handle->atlas.height, 1);
if (!handle->atlas.buffer)
return false;
goto error;
if (!font_renderer_create_atlas(handle))
goto error;

View File

@ -879,7 +879,7 @@ static void zarch_frame(void *data)
zui->tmp_block.carr.coords.vertices = 0;
menu_display_font_bind_block(zui->font, &zui->tmp_block);
menu_display_font_bind_block((font_data_t*)zui->font, &zui->tmp_block);
menu_display_push_quad(zui->width, zui->height, zui_bg_screen,
0, 0, zui->width, zui->height);
@ -957,7 +957,7 @@ static void zarch_frame(void *data)
zui->rendering = false;
menu_display_font_flush_block(zui->font);
menu_display_font_flush_block((font_data_t*)zui->font);
menu_display_unset_viewport();
}
@ -1026,7 +1026,7 @@ static void zarch_context_destroy(void *data)
if (!zui)
return;
menu_display_font_free(zui->font);
menu_display_font_free((font_data_t*)zui->font);
zarch_context_bg_destroy(data);
zui->font = NULL;