Merge git://git.denx.de/u-boot-video
This commit is contained in:
commit
2629a21e20
@ -578,7 +578,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
|
||||
unsigned long pwidth = panel_info.vl_col;
|
||||
unsigned colors, bpix, bmp_bpix;
|
||||
int hdr_size;
|
||||
struct bmp_color_table_entry *palette = bmp->color_table;
|
||||
struct bmp_color_table_entry *palette;
|
||||
|
||||
if (!bmp || !(bmp->header.signature[0] == 'B' &&
|
||||
bmp->header.signature[1] == 'M')) {
|
||||
@ -587,6 +587,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
|
||||
return 1;
|
||||
}
|
||||
|
||||
palette = bmp->color_table;
|
||||
width = get_unaligned_le32(&bmp->header.width);
|
||||
height = get_unaligned_le32(&bmp->header.height);
|
||||
bmp_bpix = get_unaligned_le16(&bmp->header.bit_count);
|
||||
|
Loading…
Reference in New Issue
Block a user