From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Fri, 17 Jul 2020 10:31:31 -0400
Subject: [4/4]  Remove HAVE_LCD_BITMAP, as it's now the only choice.

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
---
 apps/plugins/lua/rocklib_img.c | 7 -------
 apps/plugins/lua/rocklib_img.h | 2 --
 2 files changed, 9 deletions(-)

(limited to 'apps/plugins/lua')

diff --git a/apps/plugins/lua/rocklib_img.c b/apps/plugins/lua/rocklib_img.c
index 7b3ed9d2d7..1266d60310 100644
--- a/apps/plugins/lua/rocklib_img.c
+++ b/apps/plugins/lua/rocklib_img.c
@@ -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),
diff --git a/apps/plugins/lua/rocklib_img.h b/apps/plugins/lua/rocklib_img.h
index 496bc8dd93..90b24f1ad1 100644
--- a/apps/plugins/lua/rocklib_img.h
+++ b/apps/plugins/lua/rocklib_img.h
@@ -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);
 
-- 
cgit