From: notaz <notasas@gmail.com>
Date: Sun, 28 Jan 2018 17:59:58 +0000 (+0200)
Subject: fix some issues with menu bg
X-Git-Tag: v1.93~5
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d2e57b2cf580eeea067c667183f8354d75b0238;p=picodrive.git

fix some issues with menu bg
---

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index ab91e1c2..7b0cd78c 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -73,6 +73,7 @@ static void make_bg(int no_scale)
 {
 	unsigned short *src = (void *)g_menubg_src_ptr;
 	int w = g_screen_width, h = g_screen_height;
+	int pp = g_screen_ppitch;
 	short *dst;
 	int x, y;
 
@@ -87,7 +88,7 @@ static void make_bg(int no_scale)
 		d += (g_menuscreen_h / 2 - h * 2 / 2)
 			* g_menuscreen_w / 2;
 		d += (g_menuscreen_w / 2 - w * 2 / 2) / 2;
-		for (y = 0; y < h; y++, src += w, d += g_menuscreen_w*2/2) {
+		for (y = 0; y < h; y++, src += pp, d += g_menuscreen_w*2/2) {
 			for (x = 0; x < w; x++) {
 				t = src[x];
 				t = ((t & 0xf79e)>>1) - ((t & 0xc618)>>3);
@@ -107,7 +108,7 @@ static void make_bg(int no_scale)
 		(g_menuscreen_w / 2 - w / 2);
 
 	// darken the active framebuffer
-	for (; h > 0; dst += g_menuscreen_w, src += g_screen_ppitch, h--)
+	for (; h > 0; dst += g_menuscreen_w, src += pp, h--)
 		menu_darken_bg(dst, src, w, 1);
 }
 
diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index 3948cc41..4446f72e 100644
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -273,7 +273,7 @@ void plat_init(void)
 		shadow_size = 320 * 480 * 2;
 
 	shadow_fb = malloc(shadow_size);
-	g_menubg_ptr = malloc(shadow_size);
+	g_menubg_ptr = calloc(1, shadow_size);
 	if (shadow_fb == NULL || g_menubg_ptr == NULL) {
 		fprintf(stderr, "OOM\n");
 		exit(1);
diff --git a/platform/libpicofe b/platform/libpicofe
index 2b27288e..f8cd6a08 160000
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit 2b27288eb44ef9247d2a948a207d3ac9b835421a
+Subproject commit f8cd6a082bb9c228397a0436f28818b74d8e9636