Whitelist RLE compression for ARM in bmpblk_utility

utility/bmpblk_utility.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Utility for manipulating firmware screen block (BMPBLOCK) in GBB.
 //
 
 #include "bmpblk_utility.h"
 
 #include <assert.h>
@@ skipping 12 matching lines @@
   uint8_t         CharB;                // must be 'B'
   uint8_t         CharM;                // must be 'M'
   uint32_t        Size;
   uint16_t        Reserved[2];
   uint32_t        ImageOffset;
   uint32_t        HeaderSize;
   uint32_t        PixelWidth;
   uint32_t        PixelHeight;
   uint16_t        Planes;               // Must be 1 for x86
   uint16_t        BitPerPixel;          // 1, 4, 8, or 24 for x86
-  uint32_t        CompressionType;      // must be 0 for x86
+  uint32_t        CompressionType;      // 0 (none) for x86, 1 (RLE) for arm
   uint32_t        ImageSize;
   uint32_t        XPixelsPerMeter;
   uint32_t        YPixelsPerMeter;
   uint32_t        NumberOfColors;
   uint32_t        ImportantColors;
 } __attribute__((packed)) BMP_IMAGE_HEADER;
 
 
 static void error(const char *format, ...) {
   va_list ap;
@@ skipping 283 matching lines @@
   return content;
 }
 
 ImageFormat BmpBlockUtil::get_image_format(const string content) {
   if (content.size() < sizeof(BMP_IMAGE_HEADER))
     return FORMAT_INVALID;
   const BMP_IMAGE_HEADER *hdr = (const BMP_IMAGE_HEADER *)content.c_str();
 
   if (hdr->CharB != 'B' || hdr->CharM != 'M' ||
       hdr->Planes != 1 ||
-      hdr->CompressionType != 0 ||
+      (hdr->CompressionType != 0 && hdr->CompressionType != 1) ||
       (hdr->BitPerPixel != 1 && hdr->BitPerPixel != 4 &&
        hdr->BitPerPixel != 8 && hdr->BitPerPixel != 24))
     return FORMAT_INVALID;
 
   return FORMAT_BMP;
 }
 
 uint32_t BmpBlockUtil::get_bmp_image_width(const string content) {
   const BMP_IMAGE_HEADER *hdr = (const BMP_IMAGE_HEADER *)content.c_str();
   return hdr->PixelWidth;
@@ skipping 266 matching lines @@
     return display_bmpblock(bmpblock_fn);
     printf("display content of %s\n", bmpblock_fn);
     /* TODO(waihong): Implement the list mode. */
     error("List mode hasn't been implemented yet.\n");
   }
 
   return 0;
 }
 
 #endif  // WITH_UTIL_MAIN