Scanline decoding for wbmp

src/codec/SkScanlineDecoder.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 "SkScanlineDecoder.h"
 #include "SkCodec_libpng.h"
+#include "SkCodec_wbmp.h"
 #include "SkCodecPriv.h"
 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
 #include "SkJpegCodec.h"
 #endif
 
 struct DecoderProc {
     bool (*IsFormat)(SkStream*);
     SkScanlineDecoder* (*NewFromStream)(SkStream*);
 };
 
 static const DecoderProc gDecoderProcs[] = {
     { SkPngCodec::IsPng, SkPngCodec::NewSDFromStream },
 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
     { SkJpegCodec::IsJpeg, SkJpegCodec::NewSDFromStream },
 #endif
+    { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewSDFromStream },
 };
 
 SkScanlineDecoder* SkScanlineDecoder::NewFromStream(SkStream* stream) {
     if (!stream) {
         return NULL;
     }
 
     SkAutoTDelete<SkStream> streamDeleter(stream);
 
     SkAutoTDelete<SkScanlineDecoder> codec(NULL);
@@ skipping 24 matching lines @@
 SkScanlineDecoder* SkScanlineDecoder::NewFromData(SkData* data) {
     if (!data) {
         return NULL;
     }
     return NewFromStream(SkNEW_ARGS(SkMemoryStream, (data)));
 }
 
 
 SkCodec::Result SkScanlineDecoder::start(const SkImageInfo& dstInfo,
         const SkCodec::Options* options, SkPMColor ctable[], int* ctableCount) {
+    // Ensure that valid color ptrs are passed in for kIndex8 color type
+    if (kIndex_8_SkColorType == dstInfo.colorType()) {
+        if (NULL == ctable || NULL == ctableCount) {
+            return SkCodec::kInvalidParameters;
+        }
+    } else {
+        if (ctableCount) {
+            *ctableCount = 0;
+        }
+        ctableCount = NULL;
+        ctable = NULL;
+    }
+
     // Set options.
     SkCodec::Options optsStorage;
     if (NULL == options) {
         options = &optsStorage;
     }
 
     const SkCodec::Result result = this->onStart(dstInfo, *options, ctable, ctableCount);
     if (result != SkCodec::kSuccess) {
         return result;
     }
 
     fCurrScanline = 0;
     fDstInfo = dstInfo;
     return SkCodec::kSuccess;
 }
 
 SkCodec::Result SkScanlineDecoder::start(const SkImageInfo& dstInfo) {
-    SkASSERT(kIndex_8_SkColorType != dstInfo.colorType());
-    if (kIndex_8_SkColorType == dstInfo.colorType()) {
-        return SkCodec::kInvalidConversion;
-    }
     return this->start(dstInfo, NULL, NULL, NULL);
 }