Skip to contentSkip to conversation

Fix BMP decode when BMP size is bigger than framebuffer

PATCH Superseded Patrice Chotard 2 participants 6 messages Nov 20, 2019 – Dec 10, 2019 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

v2 cover Fix BMP decode when BMP size is bigger than framebuffer

This series is fixing 2 issues found when trying to decode BMP bigger than the framebuffer:
- Convert panel_picture_delta from unsigned long to long to insure to store correctly the difference between panel_size and picture_size in case the panel_size is smaller than picture_size.
- Don't rely on BMP's width and height but in width and height value computed by video_bmp_display().

Changes in v2:
- Convert panel_picture_delta from unsigned long to long

Patrice Chotard (2):
video: bmp: Fix video_splash_align_axis()
video: bmp: Fix video_display_rle8_bitmap()

 drivers/video/video_bmp.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/2 video: bmp: Fix video_splash_align_axis()

Convert panel_picture_delta from unsigned long to long to insure to store correctly the difference between panel_size and picture_size in case the panel_size is smaller than picture_size.

CC Yannick Fertré <[email protected]>

---

Changes in v2:
- Convert panel_picture_delta from unsigned long to long

 drivers/video/video_bmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/video_bmp.c +1 -1
index 193f37d275..92847a8088 100644
@@ -157,7 +157,7 @@ __weak void fb_put_word(uchar **fb, uchar **from)
 static void video_splash_align_axis(int *axis, unsigned long panel_size,
 				    unsigned long picture_size)
 {
-	unsigned long panel_picture_delta = panel_size - picture_size;
+	long panel_picture_delta = panel_size - picture_size;
 	unsigned long axis_alignment;
 
 	if (*axis == BMP_ALIGN_CENTER)
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 1/2 video: bmp: Fix video_splash_align_axis()

On Wed, 20 Nov 2019 14:11:15 +0100
Patrice Chotard patrice.chotard at st.com wrote:
...

Quoted 5 lines

Changes in v2:
- Convert panel_picture_delta from unsigned long to long

 drivers/video/video_bmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Also changed 'axis_alignment' to long and applied to u-boot-video/master, thanks!

--
Anatolij

#3 lore raw

PATCH v2 2/2 video: bmp: Fix video_display_rle8_bitmap()

In reply to Patrice Chotard

In case the BMP size is bigger than the frame buffer, don't use the BMP's width and height in video_display_rle8_bitmap, but the one's checked in video_bmp_display() as parameters to video_display_rle8_bitmap().

CC Yannick Fertré <[email protected]>

---

Changes in v2: None

 drivers/video/video_bmp.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/video/video_bmp.c +3 -5
index 92847a8088..0e7b6b20ad 100644
@@ -40,18 +40,16 @@ static void draw_encoded_bitmap(ushort **fbp, ushort col, int cnt)
 
 static void video_display_rle8_bitmap(struct udevice *dev,
 				      struct bmp_image *bmp, ushort *cmap,
-				      uchar *fb, int x_off, int y_off)
+				      uchar *fb, int x_off, int y_off,
+				      ulong width, ulong height)
 {
 	struct video_priv *priv = dev_get_uclass_priv(dev);
 	uchar *bmap;
-	ulong width, height;
 	ulong cnt, runlen;
 	int x, y;
 	int decode = 1;
 
 	debug("%s\n", __func__);
-	width = get_unaligned_le32(&bmp->header.width);
-	height = get_unaligned_le32(&bmp->header.height);
 	bmap = (uchar *)bmp + get_unaligned_le32(&bmp->header.data_offset);
 
 	x = 0;
@@ -277,7 +275,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
 				return -EPROTONOSUPPORT;
 			}
 			video_display_rle8_bitmap(dev, bmp, cmap_base, fb, x,
-						  y);
+						  y, width, height);
 			break;
 		}
 #endif
Signature · 1 line
2.17.1
#4 lore raw

PATCH v2 2/2 video: bmp: Fix video_display_rle8_bitmap()

On Wed, 20 Nov 2019 14:11:16 +0100
Patrice Chotard patrice.chotard at st.com wrote:
...

Quoted 4 lines

Changes in v2: None

 drivers/video/video_bmp.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Applied to u-boot-video/master, thanks!

--
Anatolij

#5 lore raw

v2 cover Fix BMP decode when BMP size is bigger than framebuffer

In reply to Patrice Chotard

Hi Anatolij

Just a reminder for this series which fixes stm32f746-disco boot when trying to display a splashcreen.

Thanks

Patrice

Quoted 19 lines · Patrice Chotard

This series is fixing 2 issues found when trying to decode BMP bigger than the framebuffer:
- Convert panel_picture_delta from unsigned long to long to insure to store correctly the difference between panel_size and picture_size in case the panel_size is smaller than picture_size.
- Don't rely on BMP's width and height but in width and height value computed by video_bmp_display().

Changes in v2:
- Convert panel_picture_delta from unsigned long to long

Patrice Chotard (2):
video: bmp: Fix video_splash_align_axis()
video: bmp: Fix video_display_rle8_bitmap()

 drivers/video/video_bmp.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)