Fix scanline decoding of rare RLE bmps

src/codec/SkBmpRLECodec.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 78 matching lines @@
 
     SkSampler* getSampler(bool createIfNecessary) override;
 
     SkAutoTUnref<SkColorTable>          fColorTable;    // owned
     // fNumColors is the number specified in the header, or 0 if not present in the header.
     const uint32_t                      fNumColors;
     const uint32_t                      fBytesPerColor;
     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;
 };