Fix bmp RLE "bug" and add invalid image test to CodexTest

src/codec/SkBmpCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBmpCodec.h"
 #include "SkBmpMaskCodec.h"
 #include "SkBmpRLECodec.h"
@@ skipping 459 matching lines @@
 
         // Return the codec
         switch (inputFormat) {
             case kStandard_BmpInputFormat:
                 *codecOut = SkNEW_ARGS(SkBmpStandardCodec, (imageInfo, stream,
                         bitsPerPixel, numColors, bytesPerColor,
                         offset - bytesRead, rowOrder, inIco));
                 return true;
             case kBitMask_BmpInputFormat:
                 // Bmp-in-Ico must be standard mode
                 if (inIco) {

[msarett, 2015/08/11 22:35:03]

Turns out this is reachable and we have a test now!

+                    SkCodecPrintf("Error: Icos may not use bit mask format.\n");
                     return false;
                 }
                 // Skip to the start of the pixel array.
                 // We can do this here because there is no color table to read
                 // in bit mask mode.
                 if (stream->skip(offset - bytesRead) != offset - bytesRead) {
                     SkCodecPrintf("Error: unable to skip to image data.\n");
                     return false;
                 }
 
                 *codecOut = SkNEW_ARGS(SkBmpMaskCodec, (imageInfo, stream,
                         bitsPerPixel, masks.detach(), rowOrder));
                 return true;
             case kRLE_BmpInputFormat:
                 // Bmp-in-Ico must be standard mode
-                if (inIco) {
-                    return false;
-                }
+                // This line should be unreachable, since we require that

[scroggo, 2015/08/12 14:14:30]

nit: this line is reachable - it just shouldn't be reached if inIco is true.

[msarett, 2015/08/12 15:01:24]

Haha yep.  Fixing the comment.

+                // RLE Bmps have a valid number of totalBytes, and Icos skip
+                // the header that contains totalBytes.
+                SkASSERT(!inIco);

[msarett, 2015/08/11 22:35:03]

I discovered that this is unreachable when trying to hack a test image.

                 *codecOut = SkNEW_ARGS(SkBmpRLECodec, (
                         imageInfo, stream, bitsPerPixel, numColors,
                         bytesPerColor, offset - bytesRead, rowOrder, RLEBytes));
                 return true;
             default:
                 SkASSERT(false);
                 return false;
         }
     }
 
@@ skipping 48 matching lines @@
  */
 void* SkBmpCodec::getDstStartRow(void* dst, size_t dstRowBytes, int32_t y) const {
     return (kTopDown_RowOrder == fRowOrder) ? SkTAddOffset<void*>(dst, y * dstRowBytes) : dst;
 }
 
 /*
  * Compute the number of colors in the color table
  */
 uint32_t SkBmpCodec::computeNumColors(uint32_t numColors) {
     // Zero is a default for maxColors
-    // Also set fNumColors to maxColors when it is too large
+    // Also set numColors to maxColors when it is too large
     uint32_t maxColors = 1 << fBitsPerPixel;
     if (numColors == 0 || numColors >= maxColors) {
         return maxColors;
     }
     return numColors;
 }