From ca02733961f84abd562d59e4b6a83018ef41b143 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 25 May 2018 23:37:50 +0000 Subject: Replace some #ifdefs PDF_ENABLE_XFA, part 2. Tidy some code encountered along the way in cpdfsdk_helpers.cpp Remove one ifdef from xfa-only file. Restore some option flag processing (probably wrong to remove). Flip some #ifndef to #ifdef (#ifndef PDF_ENABLE_XFA is an anti-pattern and should be treated with suspicion since XFA should always be "additive"). Change-Id: I564a28401e20e6269c85ea610da8c96f8c8dd737 Reviewed-on: https://pdfium-review.googlesource.com/32834 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- xfa/fxfa/cxfa_ffwidget.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index edb42fdd86..55ae35de27 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -65,9 +65,7 @@ FXDIB_Format XFA_GetDIBFormat(FXCODEC_IMAGE_TYPE type, bool IsFXCodecErrorStatus(FXCODEC_STATUS status) { return (status == FXCODEC_STATUS_ERROR || -#ifdef PDF_ENABLE_XFA status == FXCODEC_STATUS_ERR_MEMORY || -#endif // PDF_ENABLE_XFA status == FXCODEC_STATUS_ERR_READ || status == FXCODEC_STATUS_ERR_FLUSH || status == FXCODEC_STATUS_ERR_FORMAT || -- cgit v1.2.3