diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-05-10 16:38:15 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-10 16:38:15 +0000 |
| commit | 95061379c9453b941783398826acff674d2bbfd7 (patch) | |
| tree | 766885c5e74724ca6120562f6b8a5f57b99a4794 /core/fxcodec/codec/fx_codec.cpp | |
| parent | 35557c3ce83cc6e26f07cf5d5c520ee6afd39a67 (diff) | |
| download | pdfium-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 'core/fxcodec/codec/fx_codec.cpp')
| -rw-r--r-- | core/fxcodec/codec/fx_codec.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp index e58da052aa..d81e8f756c 100644 --- a/core/fxcodec/codec/fx_codec.cpp +++ b/core/fxcodec/codec/fx_codec.cpp @@ -1510,17 +1510,20 @@ bool CCodec_BasicModule::A85Encode(const uint8_t* src_buf, #ifdef PDF_ENABLE_XFA CFX_DIBAttribute::CFX_DIBAttribute() - : m_nXDPI(-1), - m_nYDPI(-1), - m_fAspectRatio(-1.0f), - m_wDPIUnit(0), + : +#ifdef PDF_ENABLE_XFA_BMP + m_nBmpCompressType(0), +#endif // PDF_ENABLE_BMP #ifdef PDF_ENABLE_XFA_GIF m_nGifLeft(0), m_nGifTop(0), m_pGifLocalPalette(nullptr), m_nGifLocalPalNum(0), #endif // PDF_ENABLE_XFA_GIF - m_nBmpCompressType(0) { + m_nXDPI(-1), + m_nYDPI(-1), + m_fAspectRatio(-1.0f), + m_wDPIUnit(0) { } CFX_DIBAttribute::~CFX_DIBAttribute() { |