diff options
| author | Joseph Pacheco-Corwin <hammersamatom@gmail.com> | 2019-01-29 23:00:00 +0000 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-02-04 21:20:27 -0500 |
| commit | 63d69674666eb78153ecc6a7e2ede4305ad7c966 (patch) | |
| tree | 3df18d32548f2c81cd1b509e095e1a9180a2a0bd /src/bootsplash.c | |
| parent | 34fe8660ec42e18f768fb1f5e645c7a59620e2ed (diff) | |
| download | seabios-63d69674666eb78153ecc6a7e2ede4305ad7c966.tar.gz | |
bootsplash: Added support for 16/24/32bpp in one function
Specifically added support for 16 and 32bpp files, in addition to
24bpp. The function bmp_show() in bmp.c has had the hardcoded check
for 24bpp replaced with a general bpp check that uses a % to check for
remainder, and returns 1 if the remainder is >0. The previous method
for adjusting the BMP data (raw_data_format_adjust_24bpp) relied on a
preset 3*bytes_per_line_src, this has been changed and the
multiplication is now performed in the function's arguments. This
change still allows someone else to reuse the same function for
1/2/4bpp support if necessary. The file util.h has been modified to
reflect this decision.
The changes to raw_data_format_adjust() is based on an abandoned patch
by Gert Menke (submitted March 14, 2017), credit to them for that
change and the addition of *bpp to bmp_get_info().
Signed-off-by: Joseph S. Pacheco-Corwin <hammersamatom@gmail.com>
Diffstat (limited to 'src/bootsplash.c')
| -rw-r--r-- | src/bootsplash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootsplash.c b/src/bootsplash.c index 165c98d0..538b316d 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -172,10 +172,10 @@ enable_bootsplash(void) dprintf(1, "bmp_decode failed with return code %d...\n", ret); goto done; } - bmp_get_size(bmp, &width, &height); - bpp_require = 24; + bmp_get_info(bmp, &width, &height, &bpp_require); } - /* jpeg would use 16 or 24 bpp video mode, BMP use 24bpp mode only */ + + // jpeg would use 16 or 24 bpp video mode, BMP uses 16/24/32 bpp mode. // Try to find a graphics mode with the corresponding dimensions. int videomode = find_videomode(vesa_info, mode_info, width, height, |