Fill incomplete images in SkCodec parent class

bench/subset/SubsetTranslateBench.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 "SubsetTranslateBench.h"
 #include "SubsetBenchPriv.h"
@@ skipping 73 matching lines @@
             alloc_pixels(&bitmap, subsetInfo, colors, colorCount);
 
             const uint32_t bpp = info.bytesPerPixel();
 
             for (int x = 0; x < info.width(); x += fSubsetWidth) {
                 for (int y = 0; y < info.height(); y += fSubsetHeight) {
                     SkDEBUGCODE(SkCodec::Result result =)
                     codec->startScanlineDecode(info, nullptr, get_colors(&bitmap), &colorCount);
                     SkASSERT(SkCodec::kSuccess == result);
 
-                    SkDEBUGCODE(result =) codec->skipScanlines(y);
-                    SkASSERT(SkCodec::kSuccess == result);
+                    SkDEBUGCODE(int lines =) codec->skipScanlines(y);
+                    SkASSERT(y == lines);
 
                     const uint32_t currSubsetWidth =
                             x + (int) fSubsetWidth > info.width() ?
                             info.width() - x : fSubsetWidth;
                     const uint32_t currSubsetHeight =
                             y + (int) fSubsetHeight > info.height() ?
                             info.height() - y : fSubsetHeight;
 
                     switch (codec->getScanlineOrder()) {
                         case SkCodec::kTopDown_SkScanlineOrder:
                             for (uint32_t y = 0; y < currSubsetHeight; y++) {
-                                SkDEBUGCODE(result =) codec->getScanlines(row.get(), 1, 0);
-                                SkASSERT(SkCodec::kSuccess == result);
+                                SkDEBUGCODE(lines =) codec->getScanlines(row.get(), 1, 0);
+                                SkASSERT(1 == lines);
 
                                 memcpy(bitmap.getAddr(0, y), row.get() + x * bpp,
                                         currSubsetWidth * 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(), currSubsetHeight);
                             SkBitmap stripeBm;
                             alloc_pixels(&stripeBm, stripeInfo, colors, colorCount);
 
-                            SkDEBUGCODE(result =) codec->getScanlines(stripeBm.getPixels(),
+                            SkDEBUGCODE(lines =) codec->getScanlines(stripeBm.getPixels(),
                                     currSubsetHeight, stripeBm.rowBytes());
-                            SkASSERT(SkCodec::kSuccess == result);
+                            SkASSERT(currSubsetHeight == (uint32_t) lines);
 
                             for (uint32_t subsetY = 0; subsetY < currSubsetHeight; subsetY++) {
                                 memcpy(bitmap.getAddr(0, subsetY), stripeBm.getAddr(x, subsetY),
                                         currSubsetWidth * 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
@@ skipping 29 matching lines @@
                     const uint32_t currSubsetHeight = y + (int) fSubsetHeight > height ?
                             height - y : fSubsetHeight;
                     SkIRect rect = SkIRect::MakeXYWH(x, y, currSubsetWidth,
                             currSubsetHeight);
                     SkAssertResult(decoder->decodeSubset(&bitmap, rect, fColorType));
                 }
             }
         }
     }
 }