commit 691ad76fca076967806fe99587cf51595b7ad5a5
author msarett <msarett@google.com> Thu Nov 05 11:19:29 2015 -0800
committer Commit bot <commit-bot@chromium.org> Thu Nov 05 11:19:29 2015 -0800
tree e57bb730aca0d311bc7096226f797ac47d6ec2c4
parent 5d7a7fe5631d87ca3c18d2f75d8402906616c17b

Fix bug in sampled decodes

BUG=skia:

Review URL: https://codereview.chromium.org/1417993006

src/codec/SkSampledCodec.cpp

diff --git a/src/codec/SkSampledCodec.cpp b/src/codec/SkSampledCodec.cpp
index 5302149..d5fbd0f 100644
--- a/src/codec/SkSampledCodec.cpp
+++ b/src/codec/SkSampledCodec.cpp
@@ -215,11 +215,12 @@
                             dstHeight, y + 1);
                     return SkCodec::kIncompleteInput;
                 }
-                int linesToSkip = SkTMin(sampleY - 1, dstHeight - y - 1);
-                if (!fCodec->skipScanlines(linesToSkip)) {
-                    fCodec->fillIncompleteImage(info, pixels, rowBytes, options.fZeroInitialized,
-                            dstHeight, y + 1);
-                    return SkCodec::kIncompleteInput;
+                if (y < dstHeight - 1) {
+                    if (!fCodec->skipScanlines(sampleY - 1)) {
+                        fCodec->fillIncompleteImage(info, pixels, rowBytes,
+                                options.fZeroInitialized, dstHeight, y + 1);
+                        return SkCodec::kIncompleteInput;
+                    }
                 }
                 pixelPtr = SkTAddOffset<void>(pixelPtr, rowBytes);
             }