dm changes

src/codec/SkCodec_libpng.cpp

 /*
  * 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 "SkCodec_libpng.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 606 matching lines @@
         return SkImageGenerator::kSuccess;
     }
 
     SkImageGenerator::Result onSkipScanlines(int count) override {
         // FIXME: Could we use the return value of setjmp to specify the type of
         // error?
         if (setjmp(png_jmpbuf(fCodec->fPng_ptr))) {
             SkCodecPrintf("setjmp long jump!\n");
             return SkImageGenerator::kInvalidInput;
         }
-
-        png_read_rows(fCodec->fPng_ptr, png_bytepp_NULL, png_bytepp_NULL, count);
+        for (int i = 0; i < count; i++) {

[scroggo, 2015/05/21 19:32:36]

This should perhaps be a separate CL, since it fixes a bug.

+            png_read_rows(fCodec->fPng_ptr, &fSrcRow, png_bytepp_NULL, 1);

[scroggo, 2015/05/21 19:32:36]

Maybe add a comment here that explains the potential tradeoff we've made by
putting this in a loop.

It's possible that it would be faster to pass count to png_read_rows, but it
would mean allocating more memory. (On the other hand, maybe there isn't much of
a tradeoff. I saw you were looking at the code in png_read_rows - is it more
efficient to do multiple rows at once? Or do they just have their own loop?)

+        }
         return SkImageGenerator::kSuccess;
     }
 
     void onFinish() override {
         fCodec->finish();
     }
 
     bool onReallyHasAlpha() const override { return fHasAlpha; }
 
 private:
@@ skipping 32 matching lines @@
 
     SkASSERT(fNumberPasses != INVALID_NUMBER_PASSES);
     if (fNumberPasses > 1) {
         // We cannot efficiently do scanline decoding.
         return NULL;
     }
 
     return SkNEW_ARGS(SkPngScanlineDecoder, (dstInfo, this));
 }