summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-06-04 16:52:57 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-04 16:52:57 +0000
commit037d938a172dda98b25a6e8bdfc4a83d6991fbed (patch)
treeecd47f67b3d952e200723d842ab2ec19ca00b720 /fpdfsdk
parent8c9f8106553996ead2f9803a659a36fdb11f03e8 (diff)
downloadpdfium-037d938a172dda98b25a6e8bdfc4a83d6991fbed.tar.xz
Revert "Make FPDF_LoadPage return either page type at runtime."
This reverts commit 0b4984ca4ed82023cd945512df5744eac394b53d. Reason for revert: Blocking revert of https://pdfium-review.googlesource.com/32830 Original change's description: > Make FPDF_LoadPage return either page type at runtime. > > Rely on strict use of IPDF_Page::As*() methods to prevent bad downcasts. > > Change-Id: I92a146ffbe5d145ca4f4a5b8318f3599fd1d8431 > Reviewed-on: https://pdfium-review.googlesource.com/33431 > Reviewed-by: dsinclair <dsinclair@chromium.org> > Commit-Queue: Tom Sepez <tsepez@chromium.org> TBR=thestig@chromium.org,tsepez@chromium.org,dsinclair@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I6c8a6b87941d203245f7119bac13dd25b50db0ce Reviewed-on: https://pdfium-review.googlesource.com/33731 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fpdf_view.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index feffaeb71c..f5a164a75f 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -343,14 +343,17 @@ 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;
RetainPtr<CPDF_Page> pPage = pDoc->GetOrCreatePDFPage(pDict);
return FPDFPageFromIPDFPage(pPage.Leak());
+#endif // PDF_ENABLE_XFA
}
FPDF_EXPORT double FPDF_CALLCONV FPDF_GetPageWidth(FPDF_PAGE page) {