diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-15 16:17:18 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-15 16:17:18 -0700 |
| commit | 471a1034e70ddcfc93ce2a93b28a8385109e83de (patch) | |
| tree | c845fb1b73b936023be1fc2e7699ff4768aec652 /fpdfsdk/src/fpdfeditimg.cpp | |
| parent | dfbf8e7ba55695c4e6cb30eadbe9c6a2955815ba (diff) | |
| download | pdfium-471a1034e70ddcfc93ce2a93b28a8385109e83de.tar.xz | |
Merge to XFA: Introduce CPDF_DocumentFromFPDFDocument().
Manual merges everywhere.
Original Review URL: https://codereview.chromium.org/1395493007 .
(cherry picked from commit bb51c4fb6bc6095984c303c95e5336f83e66bc67)
Original Review URL: https://codereview.chromium.org/1396283006 .
(cherry picked from commit 86adb658843658969041a13bf6cf0cc950ffe8ed)
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1395353004 .
Diffstat (limited to 'fpdfsdk/src/fpdfeditimg.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfeditimg.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp index 269b382d89..09295aa3c4 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -11,10 +11,11 @@ DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { - if (!document) - return NULL; + CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document); + if (!pDoc) + return nullptr; CPDF_ImageObject* pImageObj = new CPDF_ImageObject; - CPDF_Image* pImg = new CPDF_Image(((CPDFXFA_Document*)document)->GetPDFDoc()); + CPDF_Image* pImg = new CPDF_Image(pDoc); pImageObj->m_pImage = pImg; return pImageObj; } |