Support wbmp that are supported by SkImageDecoder

tests/CodexTest.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 "Resources.h"
 #include "SkAndroidCodec.h"
 #include "SkBitmap.h"
 #include "SkCodec.h"
 #include "SkData.h"
+#include "SkImageDecoder.h"
 #include "SkMD5.h"
 #include "SkRandom.h"
 #include "SkStream.h"
+#include "SkStreamPriv.h"
 #include "SkPngChunkReader.h"
 #include "Test.h"
 
 #include "png.h"
 
 static SkStreamAsset* resource(const char path[]) {
     SkString fullPath = GetResourcePath(path);
     return SkStream::NewFromFile(fullPath.c_str());
 }
 
@@ skipping 812 matching lines @@
     REPORTER_ASSERT(r, chunkReader.allHaveBeenSeen());
 
     // Decoding again will read the chunks again.
     chunkReader.reset();
     REPORTER_ASSERT(r, !chunkReader.allHaveBeenSeen());
     result = codec->getPixels(codec->getInfo(), decodedBm.getPixels(), decodedBm.rowBytes());
     REPORTER_ASSERT(r, SkCodec::kSuccess == result);
     REPORTER_ASSERT(r, chunkReader.allHaveBeenSeen());
 }
 #endif // PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+
+// SkCodec's wbmp decoder was initially more restrictive than SkImageDecoder.
+// It required the second byte to be zero. But SkImageDecoder allowed a couple
+// of bits to be 1 (so long as they do not overlap with 0x9F). Test that
+// SkCodec now supports an image with these bits set.
+DEF_TEST(Codec_wbmp, r) {
+    const char* path = "mandrill.wbmp";

[msarett, 2015/11/30 13:24:55]

Did we fail on this image before you made this change?

[scroggo, 2015/11/30 13:48:13]

No. See below - I had to modify the image to make it fail. With the code change,
the modified image succeeds.

Let me know if I should add comments to clarify this.

[msarett, 2015/11/30 14:00:44]

My mistake, it's perfectly clear.

+    SkAutoTDelete<SkStream> stream(resource(path));
+    if (!stream) {
+        SkDebugf("Missing resource '%s'\n", path);
+        return;
+    }
+
+    // Modify the stream to contain a second byte with some bits set.
+    SkAutoTUnref<SkData> data(SkCopyStreamToData(stream));
+    uint8_t* writeableData = static_cast<uint8_t*>(data->writable_data());
+    writeableData[1] = static_cast<uint8_t>(~0x9F);
+
+    // SkImageDecoder supports this.
+    SkBitmap bitmap;
+    REPORTER_ASSERT(r, SkImageDecoder::DecodeMemory(data->data(), data->size(), &bitmap));
+
+    // So SkCodec should, too.
+    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data));
+    REPORTER_ASSERT(r, codec);
+    if (!codec) {
+        return;
+    }
+    test_info(r, codec, codec->getInfo(), SkCodec::kSuccess, nullptr);
+}