diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-05-09 14:42:42 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-09 14:42:42 +0000 |
| commit | 27924e6c9d43f0eba57d14004853d5a8ba47de26 (patch) | |
| tree | fcc6639b62cf2fee783123b1858c618ba773da2e /xfa | |
| parent | 5f7c5be8b7072d46e8d8088a1ec14370ecfad44c (diff) | |
| download | pdfium-27924e6c9d43f0eba57d14004853d5a8ba47de26.tar.xz | |
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 <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.cpp | 5 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
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; } |