Scanline decoding for wbmp

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 "SkBitmap.h"
 #include "SkCodec.h"
@@ skipping 134 matching lines @@
             REPORTER_ASSERT(r, SkIsAlign2(subset.fLeft) && SkIsAlign2(subset.fTop));
         } else {
             // No subsets will work.
             REPORTER_ASSERT(r, result == SkCodec::kUnimplemented);
         }
     }
 }
 
 DEF_TEST(Codec, r) {
     // WBMP
-    check(r, "mandrill.wbmp", SkISize::Make(512, 512), false, false);
+    check(r, "mandrill.wbmp", SkISize::Make(512, 512), true, false);
 
     // WEBP
     check(r, "baby_tux.webp", SkISize::Make(386, 395), false, true);
     check(r, "color_wheel.webp", SkISize::Make(128, 128), false, true);
     check(r, "yellow_rose.webp", SkISize::Make(400, 301), false, true);
 
     // BMP
     check(r, "randPixels.bmp", SkISize::Make(8, 8), false, false);
 
     // ICO
@@ skipping 116 matching lines @@
     test_empty(r, "empty_images/zero-embedded.ico");
     test_empty(r, "empty_images/zero-width.bmp");
     test_empty(r, "empty_images/zero-height.bmp");
     test_empty(r, "empty_images/zero-width.jpg");
     test_empty(r, "empty_images/zero-height.jpg");
     test_empty(r, "empty_images/zero-width.png");
     test_empty(r, "empty_images/zero-height.png");
     test_empty(r, "empty_images/zero-width.wbmp");
     test_empty(r, "empty_images/zero-height.wbmp");
 }
+
+static void test_invalid_parameters(skiatest::Reporter* r, const char path[]) {
+    SkAutoTDelete<SkStream> stream(resource(path));
+    if (!stream) {
+        SkDebugf("Missing resource '%s'\n", path);
+        return;
+    }
+    SkAutoTDelete<SkScanlineDecoder> decoder(SkScanlineDecoder::NewFromStream(
+        stream.detach()));
+    
+    // This should return kSuccess because kIndex8 is supported.
+    SkPMColor colorStorage[256];
+    int colorCount;
+    SkCodec::Result result = decoder->start(
+        decoder->getInfo().makeColorType(kIndex_8_SkColorType), NULL, colorStorage, &colorCount);
+    REPORTER_ASSERT(r, SkCodec::kSuccess == result);
+    // The rest of the test is uninteresting if kIndex8 is not supported
+    if (SkCodec::kSuccess != result) {
+        return;
+    }
+
+    // This should return kInvalidParameters because, in kIndex_8 mode, we must pass in a valid
+    // colorPtr and a valid colorCountPtr.
+    result = decoder->start(
+        decoder->getInfo().makeColorType(kIndex_8_SkColorType), NULL, NULL, NULL);
+    REPORTER_ASSERT(r, SkCodec::kInvalidParameters == result);
+    result = decoder->start(
+        decoder->getInfo().makeColorType(kIndex_8_SkColorType));
+    REPORTER_ASSERT(r, SkCodec::kInvalidParameters == result);
+}
+
+DEF_TEST(Codec_Params, r) {
+    test_invalid_parameters(r, "index8.png");
+    test_invalid_parameters(r, "mandrill.wbmp");
+}