From 662816e763bbefe21c8c1b154328e131321f56b6 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 3 Sep 2015 14:38:55 -0700 Subject: 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 . --- core/include/fxcodec/fx_codec.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'core/include/fxcodec') diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index 9fc19edd53..833ac2d10d 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -14,6 +14,7 @@ #include "fx_codec_provider.h" class CFX_DIBSource; +class CJPX_Decoder; class ICodec_ScanlineDecoder; class ICodec_ProgressiveDecoder; class ICodec_BasicModule; @@ -213,27 +214,26 @@ class ICodec_JpegModule { virtual FX_DWORD GetAvailInput(void* pContext, uint8_t** avail_buf_ptr = NULL) = 0; }; + class ICodec_JpxModule { public: virtual ~ICodec_JpxModule() {} - virtual void* CreateDecoder(const uint8_t* src_buf, - FX_DWORD src_size, - FX_BOOL useColorSpace = FALSE) = 0; + virtual CJPX_Decoder* CreateDecoder(const uint8_t* src_buf, + FX_DWORD src_size, + bool use_colorspace) = 0; - virtual void GetImageInfo(void* ctx, - FX_DWORD& width, - FX_DWORD& height, - FX_DWORD& codestream_nComps, - FX_DWORD& output_nComps) = 0; + virtual void GetImageInfo(CJPX_Decoder* pDecoder, + FX_DWORD* width, + FX_DWORD* height, + FX_DWORD* components) = 0; - virtual FX_BOOL Decode(void* ctx, + virtual FX_BOOL Decode(CJPX_Decoder* pDecoder, uint8_t* dest_data, int pitch, - FX_BOOL bTranslateColor, uint8_t* offsets) = 0; - virtual void DestroyDecoder(void* ctx) = 0; + virtual void DestroyDecoder(CJPX_Decoder* pDecoder) = 0; }; class ICodec_PngModule { public: @@ -350,6 +350,7 @@ class ICodec_TiffModule { virtual void DestroyDecoder(void* ctx) = 0; }; + class ICodec_Jbig2Module { public: virtual ~ICodec_Jbig2Module() {} -- cgit v1.2.3