From a3843c99e7a631b2fbf87bbc12834e61bfb7b6f2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 Jun 2018 19:21:46 +0000 Subject: Remove some #ifdef XFA in favor of runtime checks. Make LoadDocumentImpl() logic match FPDFAvail_GetDocument() logic, so that the XFA extension is loaded before checking unsupported features. Add some comments along the way. Change-Id: I040e40fcca872f7c0a46e921bce1146f0fe42588 Reviewed-on: https://pdfium-review.googlesource.com/34931 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- fpdfsdk/cpdfsdk_helpers.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'fpdfsdk/cpdfsdk_helpers.cpp') diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp index 2f42f146cd..391e79758f 100644 --- a/fpdfsdk/cpdfsdk_helpers.cpp +++ b/fpdfsdk/cpdfsdk_helpers.cpp @@ -245,12 +245,9 @@ void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code) { } } -#ifndef PDF_ENABLE_XFA // XFA Forms - CPDF_InterForm interform(pDoc); - if (interform.HasXFAForm()) + if (!pDoc->GetExtension() && CPDF_InterForm(pDoc).HasXFAForm()) RaiseUnSupportError(FPDF_UNSP_DOC_XFAFORM); -#endif // PDF_ENABLE_XFA } #ifndef _WIN32 -- cgit v1.2.3