From f085db37c21ad2bd66e349f9307fc89b426217f5 Mon Sep 17 00:00:00 2001
From: rbpotter <rbpotter@chromium.org>
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
---
 fpdfsdk/fpdfeditimg.cpp | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'fpdfsdk')

diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp
index 531a9abc8c..56875e233e 100644
--- a/fpdfsdk/fpdfeditimg.cpp
+++ b/fpdfsdk/fpdfeditimg.cpp
@@ -24,11 +24,11 @@ FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) {
   return pImageObj;
 }
 
-DLLEXPORT FPDF_BOOL STDCALL
-FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages,
-                          int nCount,
-                          FPDF_PAGEOBJECT image_object,
-                          FPDF_FILEACCESS* fileAccess) {
+FPDF_BOOL FPDFImageObj_LoadJpegHelper(FPDF_PAGE* pages,
+                                      int nCount,
+                                      FPDF_PAGEOBJECT image_object,
+                                      FPDF_FILEACCESS* fileAccess,
+                                      bool inlineJpeg) {
   if (!image_object || !fileAccess || !pages)
     return false;
 
@@ -40,11 +40,33 @@ FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages,
     if (pPage)
       pImgObj->GetImage()->ResetCache(pPage, nullptr);
   }
-  pImgObj->GetImage()->SetJpegImage(pFile);
+
+  if (inlineJpeg)
+    pImgObj->GetImage()->SetJpegImageInline(pFile);
+  else
+    pImgObj->GetImage()->SetJpegImage(pFile);
 
   return true;
 }
 
+DLLEXPORT FPDF_BOOL STDCALL
+FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages,
+                          int nCount,
+                          FPDF_PAGEOBJECT image_object,
+                          FPDF_FILEACCESS* fileAccess) {
+  return FPDFImageObj_LoadJpegHelper(pages, nCount, image_object, fileAccess,
+                                     false);
+}
+
+DLLEXPORT FPDF_BOOL STDCALL
+FPDFImageObj_LoadJpegFileInline(FPDF_PAGE* pages,
+                                int nCount,
+                                FPDF_PAGEOBJECT image_object,
+                                FPDF_FILEACCESS* fileAccess) {
+  return FPDFImageObj_LoadJpegHelper(pages, nCount, image_object, fileAccess,
+                                     true);
+}
+
 DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetMatrix(FPDF_PAGEOBJECT image_object,
                                                    double a,
                                                    double b,
-- 
cgit v1.2.3