cmd_bmp: Add support for displaying gzip compressed bmps

The existing code can show information about a gzip compressed BMP
image, but can't actually display it.

Therefore, move the decompression code out of bmp_info() and use it in
bmp_display() as well in order to display a compressed BMP image.

Also, clean things up a bit and fix a memory leak while we're at it.

[hskinnemoen@atmel.com: a bit of refactoring]
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 907f9a2db7e15da815fa5273e4cdb26f9428cd2b..2437e2278017664bc05da3c3b1f3c6ffb5e2da1b 100644 (file)
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -36,6 +36,62 @@ static int bmp_display (ulong addr, int x, int y);
 
 int gunzip(void *, int, unsigned char *, unsigned long *);
 
+/*
+ * Allocate and decompress a BMP image using gunzip().
+ *
+ * Returns a pointer to the decompressed image data. Must be freed by
+ * the caller after use.
+ *
+ * Returns NULL if decompression failed, or if the decompressed data
+ * didn't contain a valid BMP signature.
+ */
+#ifdef CONFIG_VIDEO_BMP_GZIP
+static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
+{
+       void *dst;
+       unsigned long len;
+       bmp_image_t *bmp;
+
+       /*
+        * Decompress bmp image
+        */
+       len = CFG_VIDEO_LOGO_MAX_SIZE;
+       dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE);
+       if (dst == NULL) {
+               puts("Error: malloc in gunzip failed!\n");
+               return NULL;
+       }
+       if (gunzip(dst, CFG_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
+               free(dst);
+               return NULL;
+       }
+       if (len == CFG_VIDEO_LOGO_MAX_SIZE)
+               puts("Image could be truncated"
+                               " (increase CFG_VIDEO_LOGO_MAX_SIZE)!\n");
+
+       bmp = dst;
+
+       /*
+        * Check for bmp mark 'BM'
+        */
+       if (!((bmp->header.signature[0] == 'B') &&
+             (bmp->header.signature[1] == 'M'))) {
+               free(dst);
+               return NULL;
+       }
+
+       puts("Gzipped BMP image detected!\n");
+
+       return bmp;
+}
+#else
+static bmp_image_t *gunzip_bmp(unsigned long addr)
+{
+       return NULL;
+}
+#endif
+
+
 /*
  * Subroutine:  do_bmp
  *
@@ -101,63 +157,24 @@ U_BOOT_CMD(
 static int bmp_info(ulong addr)
 {
        bmp_image_t *bmp=(bmp_image_t *)addr;
-#ifdef CONFIG_VIDEO_BMP_GZIP
-       unsigned char *dst = NULL;
-       ulong len;
-#endif /* CONFIG_VIDEO_BMP_GZIP */
+       unsigned long len;
 
        if (!((bmp->header.signature[0]=='B') &&
-             (bmp->header.signature[1]=='M'))) {
+             (bmp->header.signature[1]=='M')))
+               bmp = gunzip_bmp(addr, &len);
 
-#ifdef CONFIG_VIDEO_BMP_GZIP
-               /*
-                * Decompress bmp image
-                */
-               len = CFG_VIDEO_LOGO_MAX_SIZE;
-               dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE);
-               if (dst == NULL) {
-                       printf("Error: malloc in gunzip failed!\n");
-                       return(1);
-               }
-               if (gunzip(dst, CFG_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
-                       printf("There is no valid bmp file at the given address\n");
-                       return(1);
-               }
-               if (len == CFG_VIDEO_LOGO_MAX_SIZE) {
-                       printf("Image could be truncated (increase CFG_VIDEO_LOGO_MAX_SIZE)!\n");
-               }
-
-               /*
-                * Set addr to decompressed image
-                */
-               bmp = (bmp_image_t *)dst;
-
-               /*
-                * Check for bmp mark 'BM'
-                */
-               if (!((bmp->header.signature[0] == 'B') &&
-                     (bmp->header.signature[1] == 'M'))) {
-                       printf("There is no valid bmp file at the given address\n");
-                       free(dst);
-                       return(1);
-               }
-
-               printf("Gzipped BMP image detected!\n");
-#else /* CONFIG_VIDEO_BMP_GZIP */
+       if (bmp == NULL) {
                printf("There is no valid bmp file at the given address\n");
-               return(1);
-#endif /* CONFIG_VIDEO_BMP_GZIP */
+               return 1;
        }
+
        printf("Image size    : %d x %d\n", le32_to_cpu(bmp->header.width),
               le32_to_cpu(bmp->header.height));
        printf("Bits per pixel: %d\n", le16_to_cpu(bmp->header.bit_count));
        printf("Compression   : %d\n", le32_to_cpu(bmp->header.compression));
 
-#ifdef CONFIG_VIDEO_BMP_GZIP
-       if (dst) {
-               free(dst);
-       }
-#endif /* CONFIG_VIDEO_BMP_GZIP */
+       if ((unsigned long)bmp != addr)
+               free(bmp);
 
        return(0);
 }
@@ -174,14 +191,33 @@ static int bmp_info(ulong addr)
  */
 static int bmp_display(ulong addr, int x, int y)
 {
+       int ret;
+       bmp_image_t *bmp = (bmp_image_t *)addr;
+       unsigned long len;
+
+       if (!((bmp->header.signature[0]=='B') &&
+             (bmp->header.signature[1]=='M')))
+               bmp = gunzip_bmp(addr, &len);
+
+       if (!bmp) {
+               printf("There is no valid bmp file at the given address\n");
+               return 1;
+       }
+
 #if defined(CONFIG_LCD)
        extern int lcd_display_bitmap (ulong, int, int);
 
-       return (lcd_display_bitmap (addr, x, y));
+       ret = lcd_display_bitmap ((unsigned long)bmp, x, y);
 #elif defined(CONFIG_VIDEO)
        extern int video_display_bitmap (ulong, int, int);
-       return (video_display_bitmap (addr, x, y));
+
+       ret = video_display_bitmap ((unsigned long)bmp, x, y);
 #else
 # error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO
 #endif
+
+       if ((unsigned long)bmp != addr)
+               free(bmp);
+
+       return ret;
 }