summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-09-03 14:38:55 -0700
committerLei Zhang <thestig@chromium.org>2015-09-03 14:38:55 -0700
commit662816e763bbefe21c8c1b154328e131321f56b6 (patch)
tree99054dd12374b3c584d61f2f928de12cc4d31a58 /core/include
parent3b5f124fb6e0995c2f3a98433083ae02239b3115 (diff)
downloadpdfium-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/include')
-rw-r--r--core/include/fxcodec/fx_codec.h23
1 files changed, 12 insertions, 11 deletions
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() {}