summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-05-25 23:37:50 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-25 23:37:50 +0000
commitca02733961f84abd562d59e4b6a83018ef41b143 (patch)
treea5f2cb28353fc82aab57f99d6605f5b817a04cce /xfa/fxfa
parentdf93cd35530e7b8dd67abde8d199c36c3fae76be (diff)
downloadpdfium-ca02733961f84abd562d59e4b6a83018ef41b143.tar.xz
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 <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/cxfa_ffwidget.cpp2
1 files changed, 0 insertions, 2 deletions
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 ||