summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2018-05-10 16:38:15 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-10 16:38:15 +0000
commit95061379c9453b941783398826acff674d2bbfd7 (patch)
tree766885c5e74724ca6120562f6b8a5f57b99a4794 /xfa/fxfa/parser
parent35557c3ce83cc6e26f07cf5d5c520ee6afd39a67 (diff)
downloadpdfium-95061379c9453b941783398826acff674d2bbfd7.tar.xz
Do not build BMP when codec is disabled
Currently all of the BMP 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 BMP codec code if support for BMP is turned off. BUG=pdfium:1080 Change-Id: I56d40639a5a3631f9c601a1eef3f98873feac94f Reviewed-on: https://pdfium-review.googlesource.com/32370 Commit-Queue: Ryan Harrison <rharrison@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/cxfa_node.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index f178bd92a9..af3ad63f72 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -163,22 +163,30 @@ int32_t XFA_Base64Decode(const char* pStr, uint8_t* pOutBuffer) {
FXCODEC_IMAGE_TYPE XFA_GetImageType(const WideString& wsType) {
WideString wsContentType(wsType);
wsContentType.MakeLower();
+
+#ifdef PDF_ENABLE_XFA_BMP
+ if (wsContentType == L"image/bmp")
+ return FXCODEC_IMAGE_BMP;
+#endif // PDF_ENABLE_XFA_BMP
+
+#ifdef PDF_ENABLE_XFA_GIF
+ if (wsContentType == L"image/gif")
+ return FXCODEC_IMAGE_GIF;
+#endif // PDF_ENABLE_XFA_GIF
+
if (wsContentType == L"image/jpg")
return FXCODEC_IMAGE_JPG;
+
#ifdef PDF_ENABLE_XFA_PNG
if (wsContentType == L"image/png")
return FXCODEC_IMAGE_PNG;
#endif // PDF_ENABLE_XFA_PNG
-#ifdef PDF_ENABLE_XFA_GIF
- if (wsContentType == L"image/gif")
- return FXCODEC_IMAGE_GIF;
-#endif // PDF_ENABLE_XFA_GIF
- if (wsContentType == L"image/bmp")
- return FXCODEC_IMAGE_BMP;
+
#ifdef PDF_ENABLE_XFA_TIFF
if (wsContentType == L"image/tif")
return FXCODEC_IMAGE_TIFF;
#endif // PDF_ENABLE_XFA_TIFF
+
return FXCODEC_IMAGE_UNKNOWN;
}