Fill incomplete images in SkCodec parent class

bench/subset/SubsetSingleBench.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 "CodecBenchPriv.h"
 #include "SubsetSingleBench.h"
 #include "SubsetBenchPriv.h"
@@ skipping 57 matching lines @@
             const SkImageInfo info = codec->getInfo().makeColorType(fColorType);
 
             SkDEBUGCODE(SkCodec::Result result =)
             codec->startScanlineDecode(info, nullptr, colors, &colorCount);
             SkASSERT(result == SkCodec::kSuccess);
 
             SkBitmap bitmap;
             SkImageInfo subsetInfo = info.makeWH(fSubsetWidth, fSubsetHeight);
             alloc_pixels(&bitmap, subsetInfo, colors, colorCount);
 
-            SkDEBUGCODE(result = ) codec->skipScanlines(fOffsetTop);
-            SkASSERT(result == SkCodec::kSuccess);
+            SkDEBUGCODE(int lines = ) codec->skipScanlines(fOffsetTop);
+            SkASSERT((uint32_t) lines == fOffsetTop);
 
             const uint32_t bpp = info.bytesPerPixel();
 
             switch (codec->getScanlineOrder()) {
                 case SkCodec::kTopDown_SkScanlineOrder: {
                     SkAutoTDeleteArray<uint8_t> row(new uint8_t[info.minRowBytes()]);
                     for (uint32_t y = 0; y < fSubsetHeight; y++) {
-                        SkDEBUGCODE(result = ) codec->getScanlines(row.get(), 1, 0);
-                        SkASSERT(result == SkCodec::kSuccess);
+                        SkDEBUGCODE(lines = ) codec->getScanlines(row.get(), 1, 0);
+                        SkASSERT(lines == 1);
 
                         memcpy(bitmap.getAddr(0, y), row.get() + fOffsetLeft * bpp,
                                 fSubsetWidth * bpp);
                     }
                     break;
                 }
                 case SkCodec::kNone_SkScanlineOrder: {
                     // decode all scanlines that intersect the subset, and copy the subset
                     // into the output.
                     SkImageInfo stripeInfo = info.makeWH(info.width(), fSubsetHeight);
                     SkBitmap stripeBm;
                     alloc_pixels(&stripeBm, stripeInfo, colors, colorCount);
 
-                    SkDEBUGCODE(result = ) codec->getScanlines(stripeBm.getPixels(), fSubsetHeight,
+                    SkDEBUGCODE(lines = ) codec->getScanlines(stripeBm.getPixels(), fSubsetHeight,
                                                                stripeBm.rowBytes());
-                    SkASSERT(result == SkCodec::kSuccess);
+                    SkASSERT((uint32_t) lines == fSubsetHeight);
 
                     for (uint32_t y = 0; y < fSubsetHeight; y++) {
                         memcpy(bitmap.getAddr(0, y), stripeBm.getAddr(fOffsetLeft, y),
                                 fSubsetWidth * bpp);
                     }
                     break;
                 }
                 default:
                     // We currently are only testing kTopDown and kNone, which are the only
                     // two used by the subsets we care about. skbug.com/4428
                     SkASSERT(false);
 
             }
         }
     } else {
         for (int count = 0; count < n; count++) {
             SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
             int width, height;
             SkAssertResult(decoder->buildTileIndex(fStream->duplicate(), &width, &height));
             SkBitmap bitmap;
             SkIRect rect = SkIRect::MakeXYWH(fOffsetLeft, fOffsetTop, fSubsetWidth,
                     fSubsetHeight);
             SkAssertResult(decoder->decodeSubset(&bitmap, rect, fColorType));
         }
     }
 }