Scanline decoding for bmp

src/codec/SkBmpStandardCodec.h

 /*
  * 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 "SkColorTable.h"
 #include "SkImageInfo.h"
@@ skipping 18 matching lines @@
      * @param bitsPerPixel the number of bits used to store each pixel
      * @param format the format of the bmp file
      * @param numColors the number of colors in the color table
      * @param bytesPerColor the number of bytes in the stream used to represent
                             each color in the color table
      * @param offset the offset of the image pixel data from the end of the
      *               headers
      * @param rowOrder indicates whether rows are ordered top-down or bottom-up
      */
     SkBmpStandardCodec(const SkImageInfo& srcInfo, SkStream* stream,
-               uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor,
-               uint32_t offset, SkBmpCodec::RowOrder rowOrder, bool isIco);
+            SkBmpCodec::BmpInputFormat inputFormat, uint16_t bitsPerPixel,
+            uint32_t numColors, uint32_t bytesPerColor, uint32_t offset,
+            SkBmpCodec::RowOrder rowOrder, bool isIco);
 
 protected:
 
     Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
                        size_t dstRowBytes, const Options&, SkPMColor*,
                        int*) override;
 
     bool onInIco() const override {
         return fInIco;
     }
@@ skipping 10 matching lines @@
     Result decode(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options& opts);
 
     SkAutoTUnref<SkColorTable>          fColorTable;     // owned
     const uint32_t                      fNumColors;
     const uint32_t                      fBytesPerColor;
     const uint32_t                      fOffset;
     SkAutoTDelete<SkSwizzler>           fSwizzler;
     SkAutoTDeleteArray<uint8_t>         fSrcBuffer;
     const bool                          fInIco;
 
+    friend class SkBmpStandardScanlineDecoder;
+
     typedef SkBmpCodec INHERITED;
 };
+
+/*
+ * Scanline decoder for standard bmps
+ */
+class SkBmpStandardScanlineDecoder : public SkScanlineDecoder {
+public:
+    SkBmpStandardScanlineDecoder(SkBmpStandardCodec* codec);
+
+    SkCodec::Result onStart(const SkImageInfo& dstInfo, const SkCodec::Options& options,
+                            SkPMColor inputColorPtr[], int* inputColorCount) override;
+
+    SkCodec::Result onGetScanlines(void* dst, int count, size_t rowBytes) override;
+
+    // TODO(msarett): Override default skipping with something more clever.
+    // TODO(msarett): Consider other optimizations for this codec.
+
+private:
+    SkAutoTDelete<SkBmpStandardCodec> fCodec;
+    SkImageInfo                       fDstInfo;
+    SkCodec::Options                  fOpts;
+
+    typedef SkScanlineDecoder INHERITED;
+};