diff options
author | Lei Zhang <thestig@chromium.org> | 2015-09-03 14:38:55 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-09-03 14:38:55 -0700 |
commit | 662816e763bbefe21c8c1b154328e131321f56b6 (patch) | |
tree | 99054dd12374b3c584d61f2f928de12cc4d31a58 /core/src/fxcodec/codec/codec_int.h | |
parent | 3b5f124fb6e0995c2f3a98433083ae02239b3115 (diff) | |
download | pdfium-662816e763bbefe21c8c1b154328e131321f56b6.tar.xz |
Merge to XFA: Cleanup dead code in CPDF_DIBSource::LoadJpxBitmap() and friends.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1310603006 .
(cherry picked from commit 097297325e0d3d00556d67885547750a2e9d4b32)
Review URL: https://codereview.chromium.org/1305223010 .
Diffstat (limited to 'core/src/fxcodec/codec/codec_int.h')
-rw-r--r-- | core/src/fxcodec/codec/codec_int.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index d172d7157e..75e1fd141b 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -311,20 +311,21 @@ class CCodec_IccModule : public ICodec_IccModule { class CCodec_JpxModule : public ICodec_JpxModule { public: CCodec_JpxModule(); - void* CreateDecoder(const uint8_t* src_buf, - FX_DWORD src_size, - FX_BOOL useColorSpace = FALSE); - void GetImageInfo(void* ctx, - FX_DWORD& width, - FX_DWORD& height, - FX_DWORD& codestream_nComps, - FX_DWORD& output_nComps); - FX_BOOL Decode(void* ctx, + ~CCodec_JpxModule() override; + + // ICodec_JpxModule: + CJPX_Decoder* CreateDecoder(const uint8_t* src_buf, + FX_DWORD src_size, + bool use_colorspace) override; + void GetImageInfo(CJPX_Decoder* pDecoder, + FX_DWORD* width, + FX_DWORD* height, + FX_DWORD* components) override; + FX_BOOL Decode(CJPX_Decoder* pDecoder, uint8_t* dest_data, int pitch, - FX_BOOL bTranslateColor, - uint8_t* offsets); - void DestroyDecoder(void* ctx); + uint8_t* offsets) override; + void DestroyDecoder(CJPX_Decoder* pDecoder) override; }; class CCodec_TiffModule : public ICodec_TiffModule { |