scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-17 05:17:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whitelist RLE compression for ARM in bmpblk_utility

Browse Source 
BUG=chromium-os:11017
TEST=use RLE BMP files as input to run bmpblk_utility

Change-Id: I2398d1c6cb9d5f90a85d8bfcab0af6e41a52b022

Review URL: http://codereview.chromium.org/6489026
This commit is contained in:
Tom Wai-Hong Tam
2011-02-14 16:08:49 +08:00
parent e1649e136c
commit a985ed405e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utility/bmpblk_utility.cc
View File

@@ -30,7 +30,7 @@ typedef struct {
uint32_t PixelHeight; uint32_t PixelHeight;
uint16_t Planes; // Must be 1 for x86 uint16_t Planes; // Must be 1 for x86
uint16_t BitPerPixel; // 1, 4, 8, or 24 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 ImageSize;
uint32_t XPixelsPerMeter; uint32_t XPixelsPerMeter;
uint32_t YPixelsPerMeter; uint32_t YPixelsPerMeter;
@@ -334,7 +334,7 @@ ImageFormat BmpBlockUtil::get_image_format(const string content) {
if (hdr->CharB != 'B' || hdr->CharM != 'M' || if (hdr->CharB != 'B' || hdr->CharM != 'M' ||
hdr->Planes != 1 || hdr->Planes != 1 ||
hdr->CompressionType != 0 || (hdr->CompressionType != 0 && hdr->CompressionType != 1) ||
(hdr->BitPerPixel != 1 && hdr->BitPerPixel != 4 && (hdr->BitPerPixel != 1 && hdr->BitPerPixel != 4 &&
hdr->BitPerPixel != 8 && hdr->BitPerPixel != 24)) hdr->BitPerPixel != 8 && hdr->BitPerPixel != 24))
return FORMAT_INVALID; return FORMAT_INVALID;