| Index: include/codec/SkCodec.h
|
| diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
|
| index dffab6b3779207aeba99084810afb27d8416a097..9476d85c4ed01b178ec60dc9710c3ef03e0fda4c 100644
|
| --- a/include/codec/SkCodec.h
|
| +++ b/include/codec/SkCodec.h
|
| @@ -397,9 +397,9 @@ public:
|
| int nextScanline() const { return this->outputScanline(fCurrScanline); }
|
|
|
| /**
|
| - * Returns the output y-coordinate of the row that corresponds to an input
|
| - * y-coordinate. The input y-coordinate represents where the scanline
|
| - * is located in the encoded data.
|
| + * Returns the output y-coordinate of the row that corresponds to an input
|
| + * y-coordinate. The input y-coordinate represents where the scanline
|
| + * is located in the encoded data.
|
| *
|
| * This will equal inputScanline, except in the case of strangely
|
| * encoded image types (bottom-up bmps, interlaced gifs).
|
| @@ -511,14 +511,22 @@ protected:
|
| virtual SkScanlineOrder onGetScanlineOrder() const { return kTopDown_SkScanlineOrder; }
|
|
|
| /**
|
| - * Update the next scanline. Used by interlaced png.
|
| + * Update the current scanline. Used by interlaced png.
|
| */
|
| - void updateNextScanline(int newY) { fCurrScanline = newY; }
|
| + void updateCurrScanline(int newY) { fCurrScanline = newY; }
|
|
|
| const SkImageInfo& dstInfo() const { return fDstInfo; }
|
|
|
| const SkCodec::Options& options() const { return fOptions; }
|
|
|
| + /**
|
| + * Returns the number of scanlines that have been decoded so far.
|
| + * This is unaffected by the SkScanlineOrder.
|
| + *
|
| + * Returns -1 if we have not started a scanline decode.
|
| + */
|
| + int currScanline() const { return fCurrScanline; }
|
| +
|
| virtual int onOutputScanline(int inputScanline) const;
|
|
|
| private:
|
|
|