Add inline JPEGs.

core/fpdfapi/page/cpdf_image.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_image.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 99 matching lines @@
   }
   m_bIsMask = false;
   m_Width = width;
   m_Height = height;
   if (!m_pStream)
     m_pStream = pdfium::MakeUnique<CPDF_Stream>();
   return pDict;
 }
 
 void CPDF_Image::SetJpegImage(
-    const CFX_RetainPtr<IFX_SeekableReadStream>& pFile) {
+    const CFX_RetainPtr<IFX_SeekableReadStream>& pFile,
+    bool inlineImage) {
   uint32_t size = pdfium::base::checked_cast<uint32_t>(pFile->GetSize());
   if (!size)
     return;
 
-  uint32_t dwEstimateSize = std::min(size, 8192U);
+  uint32_t dwEstimateSize = size;
+  if (!inlineImage)
+    dwEstimateSize = std::min(size, 8192U);
+
   std::vector<uint8_t> data(dwEstimateSize);
   if (!pFile->ReadBlock(data.data(), 0, dwEstimateSize))
     return;
 
   std::unique_ptr<CPDF_Dictionary> pDict =
       InitJPEG(data.data(), dwEstimateSize);
   if (!pDict && size > dwEstimateSize) {

[Wei Li, 2016/12/14 17:29:38]

Also, if we use this merged function, not change 'dwEstimateSize', just use "if
((!pDict || inlineImage) && size > dwEstimateSize)" here. That may be a bit
clearer.

[rbpotter, 2016/12/14 18:03:37]

Acknowledged.

     data.resize(size);
     pFile->ReadBlock(data.data(), 0, size);
     pDict = InitJPEG(data.data(), size);
   }
   if (!pDict)
     return;
 
-  m_pStream->InitStreamFromFile(pFile, std::move(pDict));
+  if (inlineImage)
+    m_pStream->InitStream(&(data[0]), size, std::move(pDict));
+  else
+    m_pStream->InitStreamFromFile(pFile, std::move(pDict));
 }
 
 void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap) {
   int32_t BitmapWidth = pBitmap->GetWidth();
   int32_t BitmapHeight = pBitmap->GetHeight();
   if (BitmapWidth < 1 || BitmapHeight < 1)
     return;
 
   auto pDict =
       pdfium::MakeUnique<CPDF_Dictionary>(m_pDocument->GetByteStringPool());
@@ skipping 211 matching lines @@
   }
   if (!ret) {
     delete m_pDIBSource;
     m_pDIBSource = nullptr;
     return false;
   }
   m_pMask = pSource->DetachMask();
   m_MatteColor = pSource->GetMatteColor();
   return false;
 }