Scanline decoding for bmp

src/codec/SkBmpRLECodec.h

Index: src/codec/SkBmpRLECodec.h
diff --git a/src/codec/SkBmpRLECodec.h b/src/codec/SkBmpRLECodec.h
index ee8989be64d78861b2c62a9ea7b02f86d75f64d0..1b4bfa390449f6c496325ed2a4252635f9d36755 100644
--- a/src/codec/SkBmpRLECodec.h
+++ b/src/codec/SkBmpRLECodec.h
@@ -35,9 +35,8 @@ public:
      *                 after decoding the headers
      */
     SkBmpRLECodec(const SkImageInfo& srcInfo, SkStream* stream,
-                  uint16_t bitsPerPixel, uint32_t numColors,
-                  uint32_t bytesPerColor, uint32_t offset,
-                  SkBmpCodec::RowOrder rowOrder, size_t RLEBytes);
+            uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor,
+            uint32_t offset, SkBmpCodec::RowOrder rowOrder, size_t RLEBytes);
 
 protected:
 
@@ -45,6 +44,10 @@ protected:
                        size_t dstRowBytes, const Options&, SkPMColor*,
                        int*) override;
 
+    SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
+            const SkCodec::Options& options, SkPMColor inputColorPtr[],
+            int* inputColorCount) override;
+
 private:
 
     /*
@@ -77,11 +80,8 @@ private:
                      const SkImageInfo& dstInfo, uint32_t x, uint32_t y,
                      uint8_t red, uint8_t green, uint8_t blue);
 
-    /*
-     * Performs the bitmap decoding for RLE input format
-     */
-    Result decode(const SkImageInfo& dstInfo, void* dst,
-                  size_t dstRowBytes, const Options& opts);
+    Result decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+                      const Options& opts) override;
 
     SkAutoTUnref<SkColorTable>          fColorTable;    // owned
     const uint32_t                      fNumColors;
@@ -90,6 +90,7 @@ private:
     SkAutoTDeleteArray<uint8_t>         fStreamBuffer;
     size_t                              fRLEBytes;
     uint32_t                            fCurrRLEByte;
+    int                                 fSampleX;
 
     typedef SkBmpCodec INHERITED;
 };