Stop calling jpeg_finish_decompress()

src/codec/SkJpegCodec.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.h"
 #include "SkJpegCodec.h"
 #include "SkJpegDecoderMgr.h"
@@ skipping 337 matching lines @@
             // behavior is unspecified but SkCodec consistently uses black as
             // the fill color for opaque images.  If the destination is kGray,
             // the low 8 bits of SK_ColorBLACK will be used.  Conveniently,
             // these are zeros, which is the representation for black in kGray.
             // If the destination is kRGB_565, the low 16 bits of SK_ColorBLACK
             // will be used.  Conveniently, these are zeros, which is the
             // representation for black in kRGB_565.
             SkSwizzler::Fill(dstRow, dstInfo, dstRowBytes, dstHeight - y,
                     SK_ColorBLACK, nullptr, options.fZeroInitialized);
 
-            // Prevent libjpeg from failing on incomplete decode
-            dinfo->output_scanline = dstHeight;
-
-            // Finish the decode and indicate that the input was incomplete.
-            jpeg_finish_decompress(dinfo);
             return fDecoderMgr->returnFailure("Incomplete image data", kIncompleteInput);
         }
 
         // Convert to RGBA if necessary
         if (JCS_CMYK == dinfo->out_color_space) {
             convert_CMYK_to_RGBA(dstRow, dstInfo.width());
         }
 
         // Move to the next row
         dstRow = SkTAddOffset<JSAMPLE>(dstRow, dstRowBytes);
     }
-    jpeg_finish_decompress(dinfo);
 
     return kSuccess;
 }
 
 SkCodec::Result SkJpegCodec::initializeSwizzler(const SkImageInfo& info, const Options& options) {
     SkSwizzler::SrcConfig srcConfig;
     switch (info.colorType()) {
         case kGray_8_SkColorType:
             srcConfig = SkSwizzler::kGray;
             break;
@@ skipping 55 matching lines @@
 
     // Now, given valid output dimensions, we can start the decompress
     if (!jpeg_start_decompress(fDecoderMgr->dinfo())) {
         SkCodecPrintf("start decompress failed\n");
         return kInvalidInput;
     }
 
     return kSuccess;
 }
 
-SkJpegCodec::~SkJpegCodec() {
-    // FIXME: This probably does not need to be called after a full decode
-    // FIXME: Is it safe to call when it doesn't need to be called?
-    if (setjmp(fDecoderMgr->getJmpBuf())) {
-        SkCodecPrintf("setjmp: Error in libjpeg finish_decompress\n");
-        return;
-    }
-
-    // We may not have decoded the entire image.  Prevent libjpeg-turbo from failing on a
-    // partial decode.
-    fDecoderMgr->dinfo()->output_scanline = this->getInfo().height();
-    jpeg_finish_decompress(fDecoderMgr->dinfo());
-}
-
 SkCodec::Result SkJpegCodec::onGetScanlines(void* dst, int count, size_t rowBytes) {
     // Set the jump location for libjpeg errors
     if (setjmp(fDecoderMgr->getJmpBuf())) {
         return fDecoderMgr->returnFailure("setjmp", kInvalidInput);
     }
     // Read rows one at a time
     JSAMPLE* dstRow;
     if (fSwizzler) {
         // write data to storage row, then sample using swizzler         
         dstRow = fSrcRow;
@@ skipping 43 matching lines @@
     // Set the jump location for libjpeg errors
     if (setjmp(fDecoderMgr->getJmpBuf())) {
         return fDecoderMgr->returnFailure("setjmp", kInvalidInput);
     }
 
     jpeg_skip_scanlines(fDecoderMgr->dinfo(), count);
 
     return kSuccess;
 }