devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.

Browse source 
Note:  I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.

Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
This commit is contained in:
Solomon Peachy 2020-07-17 10:31:31 -04:00
parent 8cb555460f
commit 658026e626
240 changed files with 288 additions and 1759 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/plugins/lua/rocklib_img.c
View file

@ -1331,10 +1331,8 @@ static inline struct viewport* opt_viewport(lua_State *L,
vp->y = check_tablevalue(L, "y", narg);
vp->width = check_tablevalue(L, "width", narg);
vp->height = check_tablevalue(L, "height", narg);
#ifdef HAVE_LCD_BITMAP
vp->font = check_tablevalue(L, "font", narg);
vp->drawmode = check_tablevalue(L, "drawmode", narg);
#endif
#if LCD_DEPTH > 1
vp->fg_pattern = (unsigned int) check_tablevalue(L, "fg_pattern", narg);
vp->bg_pattern = (unsigned int) check_tablevalue(L, "bg_pattern", narg);
@ -1379,7 +1377,6 @@ RB_WRAP(font_getstringsize)
return 3;
}
#ifdef HAVE_LCD_BITMAP
RB_WRAP(lcd_framebuffer)
{
rli_wrap(L, rb->lcd_framebuffer, LCD_WIDTH, LCD_HEIGHT);
@ -1620,8 +1617,6 @@ RB_WRAP(lcd_drawpixel)
return 0;
}
#endif /* defined(LCD_BITMAP) */
#ifdef HAVE_LCD_COLOR
RB_WRAP(lcd_rgbpack)
{
@ -1690,7 +1685,6 @@ static const luaL_Reg rocklib_img[] =
R(set_viewport),
R(clear_viewport),
R(font_getstringsize),
#ifdef HAVE_LCD_BITMAP
R(lcd_framebuffer),
R(lcd_setfont),
R(gui_scrollbar_draw),
@ -1721,7 +1715,6 @@ static const luaL_Reg rocklib_img[] =
R(lcd_vline),
R(lcd_drawpixel),
#endif /*HAVE_LCD_BITMAP*/
#ifdef HAVE_LCD_COLOR
R(lcd_rgbpack),
R(lcd_rgbunpack),

2
apps/plugins/lua/rocklib_img.h
View file

@ -22,9 +22,7 @@
#ifndef _ROCKLIB_IMG_H_
#define _ROCKLIB_IMG_H_
#ifdef HAVE_LCD_BITMAP
#define RLI_EXTENDED
#endif
LUALIB_API int (luaopen_rock_img) (lua_State *L);