Scanline decoding for bmp

src/codec/SkBmpMaskCodec.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 "SkBmpMaskCodec.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 22 matching lines @@
         default:
             return false;
     }
 }
 
 
 /*
  * Creates an instance of the decoder
  */
 SkBmpMaskCodec::SkBmpMaskCodec(const SkImageInfo& info, SkStream* stream,
+                               SkBmpCodec::BmpInputFormat inputFormat,
                                uint16_t bitsPerPixel, SkMasks* masks,
                                SkBmpCodec::RowOrder rowOrder)
-    : INHERITED(info, stream, bitsPerPixel, rowOrder)
+    : INHERITED(info, stream, inputFormat, bitsPerPixel, rowOrder)
     , fMasks(masks)
     , fMaskSwizzler(NULL)
     , fSrcBuffer(NULL)
 {}
 
 /*
  * Initiates the bitmap decode
  */
 SkCodec::Result SkBmpMaskCodec::onGetPixels(const SkImageInfo& dstInfo,
                                             void* dst, size_t dstRowBytes,
@@ skipping 72 matching lines @@
 
         // Decode the row in destination format
         int row = SkBmpCodec::kBottomUp_RowOrder == this->rowOrder() ? height - 1 - y : y;
         void* dstRow = SkTAddOffset<void>(dst, row * dstRowBytes);
         fMaskSwizzler->swizzle(dstRow, srcRow);
     }
 
     // Finished decoding the entire image
     return kSuccess;
 }
+
+SkCodec::Result SkBmpMaskCodec::onStart(const SkImageInfo& dstInfo,
+        const SkCodec::Options& options, SkPMColor inputColorPtr[], int* inputColorCount) {
+    // Initialize a the mask swizzler
+    if (!this->initializeSwizzler(dstInfo)) {
+        SkCodecPrintf("Error: cannot initialize swizzler.\n");
+        return SkCodec::kInvalidConversion;
+    }
+
+    return SkCodec::kSuccess;
+}