diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 0839610c25..0901e15beb 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -83,30 +83,6 @@ static uint16_t argb32_to_rgba4444(uint32_t col) } #endif -static void rgui_copy_glyph(uint8_t *glyph, const uint8_t *buf) -{ - int x, y; - - if (!glyph) - return; - - for (y = 0; y < FONT_HEIGHT; y++) - { - for (x = 0; x < FONT_WIDTH; x++) - { - uint32_t col = - ((uint32_t)buf[3 * (-y * 256 + x) + 0] << 0) | - ((uint32_t)buf[3 * (-y * 256 + x) + 1] << 8) | - ((uint32_t)buf[3 * (-y * 256 + x) + 2] << 16); - - uint8_t rem = 1 << ((x + y * FONT_WIDTH) & 7); - unsigned offset = (x + y * FONT_WIDTH) >> 3; - - if (col != 0xff) - glyph[offset] |= rem; - } - } -} static uint16_t rgui_gray_filler(unsigned x, unsigned y) { @@ -190,6 +166,32 @@ static void blit_line(int x, int y, } } +#if 0 +static void rgui_copy_glyph(uint8_t *glyph, const uint8_t *buf) +{ + int x, y; + + if (!glyph) + return; + + for (y = 0; y < FONT_HEIGHT; y++) + { + for (x = 0; x < FONT_WIDTH; x++) + { + uint32_t col = + ((uint32_t)buf[3 * (-y * 256 + x) + 0] << 0) | + ((uint32_t)buf[3 * (-y * 256 + x) + 1] << 8) | + ((uint32_t)buf[3 * (-y * 256 + x) + 2] << 16); + + uint8_t rem = 1 << ((x + y * FONT_WIDTH) & 7); + unsigned offset = (x + y * FONT_WIDTH) >> 3; + + if (col != 0xff) + glyph[offset] |= rem; + } + } +} + static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf) { unsigned i; @@ -213,17 +215,22 @@ static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf) return true; } +#endif static bool rguidisp_init_font(menu_handle_t *menu) { +#if 0 const uint8_t *font_bmp_buf = NULL; +#endif const uint8_t *font_bin_buf = bitmap_bin; if (!menu) return false; +#if 0 if (font_bmp_buf) return init_font(menu, font_bmp_buf); +#endif menu_display_set_font_framebuffer(font_bin_buf);