X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=menu.c;h=f32c3ce73e1ab07281e0437e4ff7b0eab20ea281;hb=006478c4f35589db6e2f8a3a14ef09c123518457;hp=bf5c8641e1805d538c4ddb9bee53b2bc1facc561;hpb=2b27288eb44ef9247d2a948a207d3ac9b835421a;p=libpicofe.git

diff --git a/menu.c b/menu.c
index bf5c864..f32c3ce 100644
--- a/menu.c
+++ b/menu.c
@@ -24,6 +24,10 @@
 #include "plat.h"
 #include "posix.h"
 
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
+
 static char static_buff[64];
 static int  menu_error_time = 0;
 char menu_error_msg[64] = { 0, };
@@ -264,14 +268,14 @@ void menu_init_base(void)
 		for (l = 0; l < 8; l++)
 		{
 			unsigned char fd8x8 = fontdata8x8[c*8+l];
-			if (fd8x8&0x80) *fd  = 0xf0;
-			if (fd8x8&0x40) *fd |= 0x0f; fd++;
-			if (fd8x8&0x20) *fd  = 0xf0;
-			if (fd8x8&0x10) *fd |= 0x0f; fd++;
-			if (fd8x8&0x08) *fd  = 0xf0;
-			if (fd8x8&0x04) *fd |= 0x0f; fd++;
-			if (fd8x8&0x02) *fd  = 0xf0;
-			if (fd8x8&0x01) *fd |= 0x0f; fd++;
+			if (fd8x8&0x80) { *fd  = 0xf0; }
+			if (fd8x8&0x40) { *fd |= 0x0f; }; fd++;
+			if (fd8x8&0x20) { *fd  = 0xf0; }
+			if (fd8x8&0x10) { *fd |= 0x0f; }; fd++;
+			if (fd8x8&0x08) { *fd  = 0xf0; }
+			if (fd8x8&0x04) { *fd |= 0x0f; }; fd++;
+			if (fd8x8&0x02) { *fd  = 0xf0; }
+			if (fd8x8&0x01) { *fd |= 0x0f; }; fd++;
 		}
 		fd += 8*2/2; // 2 empty lines
 	}
@@ -429,12 +433,12 @@ static void menu_draw_begin(int need_bg, int no_borders)
 		if (g_border_style && no_borders) {
 			for (y = 0; y < g_menuscreen_h; y++)
 				menu_darken_bg((short *)g_menuscreen_ptr + g_menuscreen_pp * y,
-					g_menubg_ptr + g_menuscreen_w * y, g_menuscreen_w, 1);
+					(short *)g_menubg_ptr + g_menuscreen_w * y, g_menuscreen_w, 1);
 		}
 		else {
 			for (y = 0; y < g_menuscreen_h; y++)
 				memcpy((short *)g_menuscreen_ptr + g_menuscreen_pp * y,
-					g_menubg_ptr + g_menuscreen_w * y, g_menuscreen_w * 2);
+					(short *)g_menubg_ptr + g_menuscreen_w * y, g_menuscreen_w * 2);
 		}
 	}
 }