ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C89_BUILD fixes

This commit is contained in:
twinaphex 2016-10-24 05:57:13 +02:00
parent 12ab2d5e7d
commit 7a18b053c4
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/drivers_font_renderer/freetype.c
View File

@ -74,7 +74,7 @@ static void font_renderer_ft_free(void *data)
static freetype_atlas_slot_t* font_renderer_get_slot(ft_font_renderer_t *handle) static freetype_atlas_slot_t* font_renderer_get_slot(ft_font_renderer_t *handle)
{ {
int i; int i, map_id;
unsigned oldest = 0; unsigned oldest = 0;
for (i = 1; i < FT_ATLAS_SIZE; i++) for (i = 1; i < FT_ATLAS_SIZE; i++)
@ -83,7 +83,7 @@ static freetype_atlas_slot_t* font_renderer_get_slot(ft_font_renderer_t *handle)
oldest = i; oldest = i;
/* remove from map */ /* remove from map */
int map_id = handle->atlas_slots[oldest].charcode & 0xFF; map_id = handle->atlas_slots[oldest].charcode & 0xFF;
if(handle->uc_map[map_id] == &handle->atlas_slots[oldest]) if(handle->uc_map[map_id] == &handle->atlas_slots[oldest])
handle->uc_map[map_id] = handle->atlas_slots[oldest].next; handle->uc_map[map_id] = handle->atlas_slots[oldest].next;
else if (handle->uc_map[map_id]) else if (handle->uc_map[map_id])
@ -162,21 +162,24 @@ static const struct font_glyph *font_renderer_ft_get_glyph(
static bool font_renderer_create_atlas(ft_font_renderer_t *handle, float font_size) static bool font_renderer_create_atlas(ft_font_renderer_t *handle, float font_size)
{ {
unsigned i, x, y, max_width, max_height; unsigned i, x, y;
freetype_atlas_slot_t* slot = NULL;
/* TODO: find a better way to determine max_width/max_height */ /* TODO: find a better way to determine max_width/max_height */
max_width = font_size; unsigned max_width = font_size;
max_height = font_size; unsigned max_height = font_size;
handle->atlas.width = max_width * FT_ATLAS_COLS;
handle->atlas.height = max_height * FT_ATLAS_ROWS;
handle->atlas.buffer = (uint8_t*) handle->atlas.width = max_width * FT_ATLAS_COLS;
handle->atlas.height = max_height * FT_ATLAS_ROWS;
handle->atlas.buffer = (uint8_t*)
calloc(handle->atlas.width * handle->atlas.height, 1); calloc(handle->atlas.width * handle->atlas.height, 1);
if (!handle->atlas.buffer) if (!handle->atlas.buffer)
return false; return false;
freetype_atlas_slot_t* slot = handle->atlas_slots; slot = handle->atlas_slots;
for (y = 0; y < FT_ATLAS_ROWS; y++) for (y = 0; y < FT_ATLAS_ROWS; y++)
{ {
for (x = 0; x < FT_ATLAS_COLS; x++) for (x = 0; x < FT_ATLAS_COLS; x++)

2
input/input_driver.c
View File

@ -506,7 +506,7 @@ int16_t input_state(unsigned port, unsigned device,
**/ **/
static bool check_input_driver_block_hotkey(bool enable_hotkey) static bool check_input_driver_block_hotkey(bool enable_hotkey)
{ {
bool use_hotkey_enable = false;; bool use_hotkey_enable = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const struct retro_keybind *bind = const struct retro_keybind *bind =
&settings->input.binds[0][RARCH_ENABLE_HOTKEY]; &settings->input.binds[0][RARCH_ENABLE_HOTKEY];