From 293c91543862a4786112c0a3b0a651f13a880535 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 25 Jun 2015 08:26:59 +0200 Subject: [PATCH] (RGUI/GLUI) Cleanups --- menu/drivers/glui.c | 6 ++++-- menu/drivers/rgui.c | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 91dc6bd89c..0b9631c7ab 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -123,7 +123,8 @@ static void glui_render_quad(gl_t *gl, int x, int y, int w, int h, coords.color = color; - menu_gl_draw_frame(gl->shader, &coords, &gl->mvp_no_rot, true, glui->textures.white); + menu_gl_draw_frame(gl->shader, &coords, + &gl->mvp_no_rot, true, glui->textures.white); gl->coords.color = gl->white_color_ptr; } @@ -214,7 +215,8 @@ static void glui_render_messagebox(const char *message) { const char *msg = list->elems[i].data; if (msg) - glui_blit_line(x, y + i * disp->font.size, msg, normal_color, TEXT_ALIGN_CENTER); + glui_blit_line(x, y + i * disp->font.size, + msg, normal_color, TEXT_ALIGN_CENTER); } end: diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 5ec1e72a6e..1418373554 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -191,12 +191,10 @@ static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf) uint8_t *font = (uint8_t *) calloc(1, FONT_OFFSET(256)); if (!font) - { - RARCH_ERR("Font memory allocation failed.\n"); return false; - } menu->display.font.alloc_framebuf = true; + for (i = 0; i < 256; i++) { unsigned y = i / 16; @@ -614,10 +612,7 @@ static void *rgui_init(void) ret = rguidisp_init_font(menu); if (!ret) - { - RARCH_ERR("No font bitmap or binary, abort"); goto error; - } fill_rect(frame_buf, 0, frame_buf->height, frame_buf->width, 4, gray_filler);