Make CPDF_Image() constructors saner.

core/fpdfapi/page/cpdf_streamcontentparser.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fpdfapi/page/cpdf_streamcontentparser.h"
 
 #include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fpdfapi/font/cpdf_type3font.h"
@@ skipping 688 matching lines @@
   SetGraphicStates(pFormObj.get(), true, true, true);
   m_pObjectHolder->GetPageObjectList()->push_back(std::move(pFormObj));
 }
 
 CPDF_ImageObject* CPDF_StreamContentParser::AddImage(UniqueStream pStream) {
   if (!pStream)
     return nullptr;
 
   auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>();
   pImageObj->SetOwnedImage(
-      pdfium::MakeUnique<CPDF_Image>(m_pDocument, pStream.release(), true));
-
+      pdfium::MakeUnique<CPDF_Image>(m_pDocument, std::move(pStream)));
   return AddImageObject(std::move(pImageObj));
 }
 
 CPDF_ImageObject* CPDF_StreamContentParser::AddImage(uint32_t streamObjNum) {
   CPDF_Stream* pStream = ToStream(m_pDocument->GetIndirectObject(streamObjNum));
   if (!pStream)
     return nullptr;
 
   auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>();
   pImageObj->SetUnownedImage(m_pDocument->LoadImageF(pStream));
@@ skipping 831 matching lines @@
       }
       default:
         bProcessed = FALSE;
     }
     if (!bProcessed) {
       m_pSyntax->SetPos(last_pos);
       return;
     }
   }
 }