Fill incomplete images in SkCodec parent class

bench/subset/SubsetZoomBench.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 "SubsetZoomBench.h"
 #include "SubsetBenchPriv.h"
@@ skipping 70 matching lines @@
                 const int subsetWidth = SkTMin(w, info.width() - subsetStartX);
                 const int subsetHeight = SkTMin(h, info.height() - subsetStartY);
                 // Note that if we subsetted and scaled in a single step, we could use the
                 // same bitmap - as is often done in actual use cases.
                 SkBitmap bitmap;
                 SkImageInfo subsetInfo = info.makeWH(subsetWidth, subsetHeight);
                 alloc_pixels(&bitmap, subsetInfo, colors, colorCount);
 
                 uint32_t bpp = info.bytesPerPixel();
 
-                SkDEBUGCODE(result = ) codec->skipScanlines(subsetStartY);
-                SkASSERT(SkCodec::kSuccess == result);
+                SkDEBUGCODE(int lines = ) codec->skipScanlines(subsetStartY);
+                SkASSERT(subsetStartY == lines);
 
                 switch (codec->getScanlineOrder()) {
                     case SkCodec::kTopDown_SkScanlineOrder:
                         for (int y = 0; y < subsetHeight; 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() + subsetStartX * bpp,
                                     subsetWidth * 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(), subsetHeight);
                         SkBitmap stripeBm;
                         alloc_pixels(&stripeBm, stripeInfo, colors, colorCount);
 
-                        SkDEBUGCODE(result = ) codec->getScanlines(stripeBm.getPixels(),
+                        SkDEBUGCODE(lines = ) codec->getScanlines(stripeBm.getPixels(),
                                 subsetHeight, stripeBm.rowBytes());
-                        SkASSERT(SkCodec::kSuccess == result);
+                        SkASSERT(subsetHeight == lines);
 
                         for (int y = 0; y < subsetHeight; y++) {
                             memcpy(bitmap.getAddr(0, y),
                                    stripeBm.getAddr(subsetStartX, y),
                                    subsetWidth * bpp);
                         }
                         break;
                     }
                     default:
                         // We currently are only testing kTopDown and kNone, which are the only
@@ skipping 23 matching lines @@
                 SkBitmap bitmap;
                 SkIRect rect = SkIRect::MakeXYWH(subsetStartX, subsetStartY, subsetWidth,
                         subsetHeight);
                 SkAssertResult(decoder->decodeSubset(&bitmap, rect, fColorType));
                 w <<= 1;
                 h <<= 1;
             } while (w < 2 * width || h < 2 * height);
         }
     }
 }