diff options
| author |  msarett <msarett@google.com> | 2015-12-03 12:23:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-03 12:23:43 -0800 |
| commit | cb0d5c940a881ee38f0f95e240b31a9052a4e440 (patch) | |
| tree | 9b856e7292e6ee5069dd89793762c14b6472d1bd /src | |
| parent | 2b1516fe35155e05331ca6d4f09be916dc1fd778 (diff) | |
Add currScanline() getter to SkCodec API
This is more correct than using nextScanline() for the
SkGifCodec scanline decoder (since we will get a strange
result in the interlaced case) and is necessary if we want
to add scanline decoding to SkIcoCodec.
This does not actually fix bugs or change behavior.
BUG=skia:
Review URL: https://codereview.chromium.org/1489163002
Diffstat (limited to 'src')
| -rw-r--r-- | src/codec/SkCodec_libgif.cpp | 2 | ||||
| -rw-r--r-- | src/codec/SkCodec_libpng.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/codec/SkCodec_libgif.cpp b/src/codec/SkCodec_libgif.cpp index 8021af95a2..e6a40164f3 100644 --- a/src/codec/SkCodec_libgif.cpp +++ b/src/codec/SkCodec_libgif.cpp @@ -508,7 +508,7 @@ SkCodec::Result SkGifCodec::onStartScanlineDecode(const SkImageInfo& dstInfo, void SkGifCodec::handleScanlineFrame(int count, int* rowsBeforeFrame, int* rowsInFrame) { if (fFrameIsSubset) { - const int currRow = this->INHERITED::nextScanline(); + const int currRow = this->currScanline(); // The number of rows that remain to be skipped before reaching rows that we // actually must decode into. diff --git a/src/codec/SkCodec_libpng.cpp b/src/codec/SkCodec_libpng.cpp index 355d493309..a611705c3b 100644 --- a/src/codec/SkCodec_libpng.cpp +++ b/src/codec/SkCodec_libpng.cpp @@ -768,7 +768,7 @@ public: if (!this->rewindIfNeeded()) { return kCouldNotRewind; } - this->updateNextScanline(currScanline); + this->updateCurrScanline(currScanline); } if (setjmp(png_jmpbuf(this->png_ptr()))) { |