Fill incomplete images in SkCodec parent class

src/codec/SkCodec.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 "SkBmpCodec.h"
 #include "SkCodec.h"
 #include "SkData.h"
@@ skipping 61 matching lines @@
     if (!data) {
         return nullptr;
     }
     return NewFromStream(new SkMemoryStream(data));
 }
 
 SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream)
     : fInfo(info)
     , fStream(stream)
     , fNeedsRewind(false)
+    , fIncompleteScanlines(0)
 {}
 
 SkCodec::~SkCodec() {}
 
 bool SkCodec::rewindIfNeeded() {
     // Store the value of fNeedsRewind so we can update it. Next read will
     // require a rewind.
     const bool needsRewind = fNeedsRewind;
     fNeedsRewind = true;
     if (!needsRewind) {
@@ skipping 38 matching lines @@
         {
             return kInvalidConversion;
         }
     }
 
     // Default options.
     Options optsStorage;
     if (nullptr == options) {
         options = &optsStorage;
     }
-    const Result result = this->onGetPixels(info, pixels, rowBytes, *options, ctable, ctableCount);
+
+    // On an incomplete decode, the subclass can specify the number of scanlines that it failed
+    // to decode.
+    int incompleteScanlines = 0;
+    const Result result = this->onGetPixels(info, pixels, rowBytes, *options, ctable, ctableCount,
+            &incompleteScanlines);
 
     if ((kIncompleteInput == result || kSuccess == result) && ctableCount) {
         SkASSERT(*ctableCount >= 0 && *ctableCount <= 256);
     }
+
+    // A return value of kIncompleteInput indicates a truncated image stream.
+    // In this case, we will fill any uninitialized memory with a default value.
+    if (kIncompleteInput == result && 0 != incompleteScanlines) {
+        void* fillDst = this->getFillDst(pixels, rowBytes, info.height() - incompleteScanlines);

[scroggo, 2015/09/25 15:55:05]

My mistake, you end up doing another subtract. If you just return the rows
decoded, you could avoid both, right?

[msarett, 2015/10/01 12:44:52]

Acknowledged.

+        const SkImageInfo fillInfo = info.makeWH(info.width(), incompleteScanlines);
+        const uint32_t fillValue = this->getFillValue(fillInfo);
+        SkSwizzler::Fill(fillDst, fillInfo, rowBytes, fillValue, options->fZeroInitialized);
+    }
+
     return result;
 }
 
 SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
     return this->getPixels(info, pixels, rowBytes, nullptr, nullptr, nullptr);
 }