diff options
| author | Sylwester Nawrocki | 2020-12-01 12:30:50 +0100 |
|---|---|---|
| committer | Anatolij Gustschin | 2021-04-10 17:09:59 +0200 |
| commit | 38e18d6392fca9f6809cb3079af3069efc3d181f (patch) | |
| tree | a110c47b6abc77ed754d9011b4255ec1e5724dcd /drivers/video/video_bmp.c | |
| parent | 131c224168c63e22570b84f757ccf2c8898a1a1a (diff) | |
video: Fix line padding calculation for 16 and 24 BPP bitmaps
Each row in the pixel array in the bitmap file is padded
if necessary so the row size is always a multiple of 4 bytes.
In current code the complement of row size to a multiple of
4 bytes is further unnecessarily multiplied by the pixel size.
This results in incorrect displaying of bitmaps having row size
that is not a multiple of 4 bytes. Fix this by removing
the unnecessary multiplication.
Tested with 24BPP bitmap and XRGB32 display.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
Diffstat (limited to 'drivers/video/video_bmp.c')
| -rw-r--r-- | drivers/video/video_bmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 66de22318f2..1e6f07ff4b0 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -328,7 +328,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, for (j = 0; j < width; j++) fb_put_word(&fb, &bmap); - bmap += (padded_width - width) * 2; + bmap += (padded_width - width); fb -= width * 2 + priv->line_length; } break; @@ -352,7 +352,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, } } fb -= priv->line_length + width * (bpix / 8); - bmap += (padded_width - width) * 3; + bmap += (padded_width - width); } break; #endif /* CONFIG_BMP_24BPP */ |