video: Fix line padding calculation for 16 and 24 bpp bitmaps

The line size in the bitmap file is 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 result in incorrect displaying of bitmaps
with image width which is not multiple of 4 pixels. Fix this by removing
the unnecessary multiplication.

Tested with 24BPP bitmap and XRGB32 display.

Change-Id: I9bd307780e388a70f47823444fe3ecdf910d08fb
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 5a4d12c..5537378 100644 (file)
--- 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 */