brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-10 13:16:16 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-video

Browse Source
This commit is contained in:
Wolfgang Denk 2008-04-24 14:00:54 +02:00
commit be32bf20bc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/cfb_console.c
View File

@ -849,6 +849,7 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
if (!((bmp->header.signature[0] == 'B') && if (!((bmp->header.signature[0] == 'B') &&
(bmp->header.signature[1] == 'M'))) { (bmp->header.signature[1] == 'M'))) {
printf ("Error: no valid bmp.gz image at %lx\n", bmp_image); printf ("Error: no valid bmp.gz image at %lx\n", bmp_image);
free(dst);
return 1; return 1;
} }
#else #else
@ -869,6 +870,10 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
if (compression != BMP_BI_RGB) { if (compression != BMP_BI_RGB) {
printf ("Error: compression type %ld not supported\n", printf ("Error: compression type %ld not supported\n",
compression); compression);
#ifdef CONFIG_VIDEO_BMP_GZIP
if (dst)
free(dst);
#endif
return 1; return 1;
} }