diff options
| -rw-r--r-- | fpdfsdk/fpdf_editpage.cpp | 6 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_view.cpp | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp index 9dcd470978..4acb5b6cb5 100644 --- a/fpdfsdk/fpdf_editpage.cpp +++ b/fpdfsdk/fpdf_editpage.cpp @@ -199,13 +199,11 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDFPage_New(FPDF_DOCUMENT document, pXFAPage->LoadPDFPage(pPageDict); return FPDFPageFromIPDFPage(pXFAPage.Leak()); // Caller takes ownership. } - // Eventually, fallthru into non-XFA case once page type is consistent. - return nullptr; -#else // PDF_ENABLE_XFA +#endif // PDF_ENABLE_XFA + auto pPage = pdfium::MakeRetain<CPDF_Page>(pDoc, pPageDict, true); pPage->ParseContent(); return FPDFPageFromIPDFPage(pPage.Leak()); // Caller takes ownership. -#endif // PDF_ENABLE_XFA } FPDF_EXPORT int FPDF_CALLCONV FPDFPage_GetRotation(FPDF_PAGE page) { diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp index bfaf537feb..0e76548abf 100644 --- a/fpdfsdk/fpdf_view.cpp +++ b/fpdfsdk/fpdf_view.cpp @@ -343,10 +343,8 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDF_LoadPage(FPDF_DOCUMENT document, auto* pContext = static_cast<CPDFXFA_Context*>(pDoc->GetExtension()); if (pContext) return FPDFPageFromIPDFPage(pContext->GetXFAPage(page_index).Leak()); +#endif // PDF_ENABLE_XFA - // Eventually, fallthrough into non-xfa case once page type made consistent. - return nullptr; -#else // PDF_ENABLE_XFA CPDF_Dictionary* pDict = pDoc->GetPageDictionary(page_index); if (!pDict) return nullptr; @@ -354,7 +352,6 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDF_LoadPage(FPDF_DOCUMENT document, auto pPage = pdfium::MakeRetain<CPDF_Page>(pDoc, pDict, true); pPage->ParseContent(); return FPDFPageFromIPDFPage(pPage.Leak()); -#endif // PDF_ENABLE_XFA } FPDF_EXPORT double FPDF_CALLCONV FPDF_GetPageWidth(FPDF_PAGE page) { |