From f085db37c21ad2bd66e349f9307fc89b426217f5 Mon Sep 17 00:00:00 2001 From: rbpotter Date: Wed, 14 Dec 2016 11:44:31 -0800 Subject: Add inline JPEGs. Allows JPEG data to be copied into the file rather than left in a separate file. This is needed to allow rasterized PDFs to avoid saving image files for each page. See Chromium issue 2524143003 for chromium changes. BUG=534945, 550205, 480628 Review-Url: https://codereview.chromium.org/2529543003 --- core/fpdfapi/page/cpdf_image.cpp | 17 +++++++++++++++++ core/fpdfapi/page/cpdf_image.h | 1 + 2 files changed, 18 insertions(+) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index a17222e343..c910319aba 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -140,6 +140,23 @@ void CPDF_Image::SetJpegImage( m_pStream->InitStreamFromFile(pFile, std::move(pDict)); } +void CPDF_Image::SetJpegImageInline( + const CFX_RetainPtr& pFile) { + uint32_t size = pdfium::base::checked_cast(pFile->GetSize()); + if (!size) + return; + + std::vector data(size); + if (!pFile->ReadBlock(data.data(), 0, size)) + return; + + std::unique_ptr pDict = InitJPEG(data.data(), size); + if (!pDict) + return; + + m_pStream->InitStream(&(data[0]), size, std::move(pDict)); +} + void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap) { int32_t BitmapWidth = pBitmap->GetWidth(); int32_t BitmapHeight = pBitmap->GetHeight(); diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index 1b0d74f123..e0fc761b38 100644 --- a/core/fpdfapi/page/cpdf_image.h +++ b/core/fpdfapi/page/cpdf_image.h @@ -52,6 +52,7 @@ class CPDF_Image { void SetImage(const CFX_DIBitmap* pDIBitmap); void SetJpegImage(const CFX_RetainPtr& pFile); + void SetJpegImageInline(const CFX_RetainPtr& pFile); void ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pDIBitmap); -- cgit v1.2.3