diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-19 22:11:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-19 22:11:05 -0400 |
| commit | 2629a21e209d91cdb778f43612235ed1f3029488 (patch) | |
| tree | 8b6fb31e582583158da079aa164a9472de57b7a6 | |
| parent | 5619295995e3262bb5770e8b5e945ffdc5442145 (diff) | |
| parent | 021414a33248f9c1f6eb4a676f4a1fbcfa26f475 (diff) | |
Merge git://git.denx.de/u-boot-video
| -rw-r--r-- | common/lcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/lcd.c b/common/lcd.c index c3ff9599ed..4b3d7dcd34 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -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); |