Fix scanline decoding of rare RLE bmps

src/codec/SkBmpRLECodec.h

Index: src/codec/SkBmpRLECodec.h
diff --git a/src/codec/SkBmpRLECodec.h b/src/codec/SkBmpRLECodec.h
index df2a97d84502010a0c86efc5940466f9aba16082..e319a71052dd04d0b3371e9452a0306cd7d17466 100644
--- a/src/codec/SkBmpRLECodec.h
+++ b/src/codec/SkBmpRLECodec.h
@@ -96,9 +96,16 @@ private:
     const uint32_t                      fOffset;
     SkAutoTDeleteArray<uint8_t>         fStreamBuffer;
     size_t                              fRLEBytes;
+    const size_t                        fOrigRLEBytes;
     uint32_t                            fCurrRLEByte;
     int                                 fSampleX;
     SkAutoTDelete<SkSampler>            fSampler;
 
+    // Scanline decodes allow the client to ask for a single scanline at a time.
+    // This can be tricky when the RLE encoding instructs the decoder to jump down
+    // multiple lines.  This field keeps track of lines that need to be skipped
+    // on subsequent calls to decodeRows().
+    int                                 fLinesToSkip;
+
     typedef SkBmpCodec INHERITED;
 };