From 27924e6c9d43f0eba57d14004853d5a8ba47de26 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Wed, 9 May 2018 14:42:42 +0000 Subject: Do not build TIFF when codec is disabled Currently all of the TIFF related code is being built when support for the codec is disabled, it just isn't being utilized. Depending on the settings being used, this unneeded code may or may not get stripped during linking. This CL explicitly turns off building the TIFF codec code if support for TIFF is turned off. It also fixes cases in the code base where tif was being used instead of tiff. BUG=pdfium:1080 Change-Id: If6aaa8af5160fdd5b261e63bab7d5984196efcc9 Reviewed-on: https://pdfium-review.googlesource.com/32193 Commit-Queue: Ryan Harrison Reviewed-by: Tom Sepez --- xfa/fxfa/cxfa_ffwidget.cpp | 5 ++++- xfa/fxfa/parser/cxfa_node.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index 8b2e826165..6fd2397670 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -42,7 +42,10 @@ FXDIB_Format XFA_GetDIBFormat(FXCODEC_IMAGE_TYPE type, switch (type) { case FXCODEC_IMAGE_BMP: case FXCODEC_IMAGE_JPG: - case FXCODEC_IMAGE_TIF: { +#ifdef PDF_ENABLE_XFA_TIFF + case FXCODEC_IMAGE_TIFF: +#endif // PDF_ENABLE_XFA_TIFF + { dibFormat = FXDIB_Rgb32; int32_t bpp = iComponents * iBitsPerComponent; if (bpp <= 24) { diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 91e78dc485..674ec00d8e 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -171,8 +171,10 @@ FXCODEC_IMAGE_TYPE XFA_GetImageType(const WideString& wsType) { return FXCODEC_IMAGE_GIF; if (wsContentType == L"image/bmp") return FXCODEC_IMAGE_BMP; +#ifdef PDF_ENABLE_XFA_TIFF if (wsContentType == L"image/tif") - return FXCODEC_IMAGE_TIF; + return FXCODEC_IMAGE_TIFF; +#endif // PDF_ENABLE_XFA_TIFF return FXCODEC_IMAGE_UNKNOWN; } -- cgit v1.2.3