diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-11-25 15:52:28 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-11-25 15:52:28 -0800 |
commit | a2c42ce6150c4072613a6fc9fa0dc064dbf0a15d (patch) | |
tree | b1705df8ed8c9f2f8db5095fbb6e19548493eacd /core/src/fxcodec/codec/fx_codec.cpp | |
parent | 214947de80a9be2ddb134b1962affc82e20563c9 (diff) | |
download | pdfium-a2c42ce6150c4072613a6fc9fa0dc064dbf0a15d.tar.xz |
Manual fixups to PDF_ENABLE_XFA in core/
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1477663003 .
Diffstat (limited to 'core/src/fxcodec/codec/fx_codec.cpp')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index fb98fee3c5..a52dd8a496 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -21,17 +21,14 @@ CCodec_ModuleMgr::CCodec_ModuleMgr() m_pJpxModule(new CCodec_JpxModule), m_pJbig2Module(new CCodec_Jbig2Module), m_pIccModule(new CCodec_IccModule), -#ifndef PDF_ENABLE_XFA - m_pFlateModule(new CCodec_FlateModule) { -} -#else - m_pFlateModule(new CCodec_FlateModule), +#ifdef PDF_ENABLE_XFA m_pPngModule(new CCodec_PngModule), m_pGifModule(new CCodec_GifModule), m_pBmpModule(new CCodec_BmpModule), - m_pTiffModule(new CCodec_TiffModule) { + m_pTiffModule(new CCodec_TiffModule), +#endif // PDF_ENABLE_XFA + m_pFlateModule(new CCodec_FlateModule) { } -#endif CCodec_ScanlineDecoder::ImageDataCache::ImageDataCache(int width, int height, @@ -267,6 +264,7 @@ FX_BOOL CCodec_BasicModule::A85Encode(const uint8_t* src_buf, FX_DWORD& dest_size) { return FALSE; } + #ifdef PDF_ENABLE_XFA CFX_DIBAttribute::CFX_DIBAttribute() : m_nXDPI(-1), @@ -284,8 +282,8 @@ CFX_DIBAttribute::~CFX_DIBAttribute() { for (const auto& pair : m_Exif) FX_Free(pair.second); } +#endif // PDF_ENABLE_XFA -#endif class CCodec_RLScanlineDecoder : public CCodec_ScanlineDecoder { public: CCodec_RLScanlineDecoder(); |