From 9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 4 Aug 2015 13:00:21 -0700 Subject: XFA: clang-format all pdfium code. No behavior change. Generated by: find . -name '*.cpp' -o -name '*.h' | \ grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \ xargs ../../buildtools/mac/clang-format -i Then manually merged https://codereview.chromium.org/1269223002/ See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion. BUG=none --- core/include/fxcodec/fx_codec.h | 817 ++++++++++++++++++------------- core/include/fxcodec/fx_codec_def.h | 142 +++--- core/include/fxcodec/fx_codec_flate.h | 6 +- core/include/fxcodec/fx_codec_provider.h | 73 +-- 4 files changed, 592 insertions(+), 446 deletions(-) (limited to 'core/include/fxcodec') diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index 5b0092a6ff..9fc19edd53 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -31,396 +31,523 @@ class ICodec_TiffModule; class CFX_DIBAttribute; class ICodec_ScanlineDecoder; -class CCodec_ModuleMgr -{ -public: - CCodec_ModuleMgr(); - ICodec_ProgressiveDecoder* CreateProgressiveDecoder(); - ICodec_Jbig2Encoder* CreateJbig2Encoder(); - ICodec_BasicModule* GetBasicModule() const { return m_pBasicModule.get(); } - ICodec_FaxModule* GetFaxModule() const { return m_pFaxModule.get(); } - ICodec_JpegModule* GetJpegModule() const { return m_pJpegModule.get(); } - ICodec_JpxModule* GetJpxModule() const { return m_pJpxModule.get(); } - ICodec_Jbig2Module* GetJbig2Module() const { return m_pJbig2Module.get(); } - ICodec_IccModule* GetIccModule() const { return m_pIccModule.get(); } - ICodec_FlateModule* GetFlateModule() const { return m_pFlateModule.get(); } - ICodec_PngModule* GetPngModule() const { return m_pPngModule.get(); } - ICodec_GifModule* GetGifModule() const { return m_pGifModule.get(); } - ICodec_BmpModule* GetBmpModule() const { return m_pBmpModule.get(); } - ICodec_TiffModule* GetTiffModule() const { return m_pTiffModule.get(); } - -protected: - nonstd::unique_ptr m_pBasicModule; - nonstd::unique_ptr m_pFaxModule; - nonstd::unique_ptr m_pJpegModule; - nonstd::unique_ptr m_pJpxModule; - nonstd::unique_ptr m_pJbig2Module; - nonstd::unique_ptr m_pIccModule; - nonstd::unique_ptr m_pFlateModule; - nonstd::unique_ptr m_pPngModule; - nonstd::unique_ptr m_pGifModule; - nonstd::unique_ptr m_pBmpModule; - nonstd::unique_ptr m_pTiffModule; +class CCodec_ModuleMgr { + public: + CCodec_ModuleMgr(); + ICodec_ProgressiveDecoder* CreateProgressiveDecoder(); + ICodec_Jbig2Encoder* CreateJbig2Encoder(); + ICodec_BasicModule* GetBasicModule() const { return m_pBasicModule.get(); } + ICodec_FaxModule* GetFaxModule() const { return m_pFaxModule.get(); } + ICodec_JpegModule* GetJpegModule() const { return m_pJpegModule.get(); } + ICodec_JpxModule* GetJpxModule() const { return m_pJpxModule.get(); } + ICodec_Jbig2Module* GetJbig2Module() const { return m_pJbig2Module.get(); } + ICodec_IccModule* GetIccModule() const { return m_pIccModule.get(); } + ICodec_FlateModule* GetFlateModule() const { return m_pFlateModule.get(); } + ICodec_PngModule* GetPngModule() const { return m_pPngModule.get(); } + ICodec_GifModule* GetGifModule() const { return m_pGifModule.get(); } + ICodec_BmpModule* GetBmpModule() const { return m_pBmpModule.get(); } + ICodec_TiffModule* GetTiffModule() const { return m_pTiffModule.get(); } + + protected: + nonstd::unique_ptr m_pBasicModule; + nonstd::unique_ptr m_pFaxModule; + nonstd::unique_ptr m_pJpegModule; + nonstd::unique_ptr m_pJpxModule; + nonstd::unique_ptr m_pJbig2Module; + nonstd::unique_ptr m_pIccModule; + nonstd::unique_ptr m_pFlateModule; + nonstd::unique_ptr m_pPngModule; + nonstd::unique_ptr m_pGifModule; + nonstd::unique_ptr m_pBmpModule; + nonstd::unique_ptr m_pTiffModule; }; -class ICodec_BasicModule -{ -public: - - virtual ~ICodec_BasicModule() {} - virtual FX_BOOL RunLengthEncode(const uint8_t* src_buf, FX_DWORD src_size, uint8_t*& dest_buf, - FX_DWORD& dest_size) = 0; - virtual FX_BOOL A85Encode(const uint8_t* src_buf, FX_DWORD src_size, uint8_t*& dest_buf, - FX_DWORD& dest_size) = 0; - virtual ICodec_ScanlineDecoder* CreateRunLengthDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height, - int nComps, int bpc) = 0; +class ICodec_BasicModule { + public: + virtual ~ICodec_BasicModule() {} + virtual FX_BOOL RunLengthEncode(const uint8_t* src_buf, + FX_DWORD src_size, + uint8_t*& dest_buf, + FX_DWORD& dest_size) = 0; + virtual FX_BOOL A85Encode(const uint8_t* src_buf, + FX_DWORD src_size, + uint8_t*& dest_buf, + FX_DWORD& dest_size) = 0; + virtual ICodec_ScanlineDecoder* CreateRunLengthDecoder(const uint8_t* src_buf, + FX_DWORD src_size, + int width, + int height, + int nComps, + int bpc) = 0; }; -class ICodec_ScanlineDecoder -{ -public: - - virtual ~ICodec_ScanlineDecoder() {} +class ICodec_ScanlineDecoder { + public: + virtual ~ICodec_ScanlineDecoder() {} - virtual FX_DWORD GetSrcOffset() = 0; + virtual FX_DWORD GetSrcOffset() = 0; - virtual void DownScale(int dest_width, int dest_height) = 0; + virtual void DownScale(int dest_width, int dest_height) = 0; - virtual uint8_t* GetScanline(int line) = 0; + virtual uint8_t* GetScanline(int line) = 0; - virtual FX_BOOL SkipToScanline(int line, IFX_Pause* pPause) = 0; + virtual FX_BOOL SkipToScanline(int line, IFX_Pause* pPause) = 0; - virtual int GetWidth() = 0; + virtual int GetWidth() = 0; - virtual int GetHeight() = 0; + virtual int GetHeight() = 0; - virtual int CountComps() = 0; + virtual int CountComps() = 0; - virtual int GetBPC() = 0; + virtual int GetBPC() = 0; - virtual FX_BOOL IsColorTransformed() = 0; + virtual FX_BOOL IsColorTransformed() = 0; - virtual void ClearImageData() = 0; + virtual void ClearImageData() = 0; +}; +class ICodec_FlateModule { + public: + virtual ~ICodec_FlateModule() {} + virtual ICodec_ScanlineDecoder* CreateDecoder(const uint8_t* src_buf, + FX_DWORD src_size, + int width, + int height, + int nComps, + int bpc, + int predictor, + int Colors, + int BitsPerComponent, + int Columns) = 0; + virtual FX_DWORD FlateOrLZWDecode(FX_BOOL bLZW, + const uint8_t* src_buf, + FX_DWORD src_size, + FX_BOOL bEarlyChange, + int predictor, + int Colors, + int BitsPerComponent, + int Columns, + FX_DWORD estimated_size, + uint8_t*& dest_buf, + FX_DWORD& dest_size) = 0; + virtual FX_BOOL Encode(const uint8_t* src_buf, + FX_DWORD src_size, + int predictor, + int Colors, + int BitsPerComponent, + int Columns, + uint8_t*& dest_buf, + FX_DWORD& dest_size) = 0; + virtual FX_BOOL Encode(const uint8_t* src_buf, + FX_DWORD src_size, + uint8_t*& dest_buf, + FX_DWORD& dest_size) = 0; +}; +class ICodec_FaxModule { + public: + virtual ~ICodec_FaxModule() {} + + virtual ICodec_ScanlineDecoder* CreateDecoder(const uint8_t* src_buf, + FX_DWORD src_size, + int width, + int height, + int K, + FX_BOOL EndOfLine, + FX_BOOL EncodedByteAlign, + FX_BOOL BlackIs1, + int Columns, + int Rows) = 0; + + virtual FX_BOOL Encode(const uint8_t* src_buf, + int width, + int height, + int pitch, + uint8_t*& dest_buf, + FX_DWORD& dest_size) = 0; }; -class ICodec_FlateModule -{ -public: - - virtual ~ICodec_FlateModule() {} - virtual ICodec_ScanlineDecoder* CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height, - int nComps, int bpc, int predictor, int Colors, int BitsPerComponent, int Columns) = 0; - virtual FX_DWORD FlateOrLZWDecode(FX_BOOL bLZW, const uint8_t* src_buf, FX_DWORD src_size, FX_BOOL bEarlyChange, - int predictor, int Colors, int BitsPerComponent, int Columns, - FX_DWORD estimated_size, uint8_t*& dest_buf, FX_DWORD& dest_size) = 0; - virtual FX_BOOL Encode(const uint8_t* src_buf, FX_DWORD src_size, - int predictor, int Colors, int BitsPerComponent, int Columns, - uint8_t*& dest_buf, FX_DWORD& dest_size) = 0; - virtual FX_BOOL Encode(const uint8_t* src_buf, FX_DWORD src_size, uint8_t*& dest_buf, FX_DWORD& dest_size) = 0; +class ICodec_JpegModule { + public: + virtual ~ICodec_JpegModule() {} + + virtual void SetPovider(IFX_JpegProvider* pJP) = 0; + + virtual ICodec_ScanlineDecoder* CreateDecoder(const uint8_t* src_buf, + FX_DWORD src_size, + int width, + int height, + int nComps, + FX_BOOL ColorTransform) = 0; + + virtual FX_BOOL LoadInfo(const uint8_t* src_buf, + FX_DWORD src_size, + int& width, + int& height, + int& num_components, + int& bits_per_components, + FX_BOOL& color_transform, + uint8_t** icc_buf_ptr = NULL, + FX_DWORD* icc_length = NULL) = 0; + + virtual FX_BOOL Encode(const class CFX_DIBSource* pSource, + uint8_t*& dest_buf, + FX_STRSIZE& dest_size, + int quality = 75, + const uint8_t* icc_buf = NULL, + FX_DWORD icc_length = 0) = 0; + + virtual void* Start() = 0; + + virtual void Finish(void* pContext) = 0; + + virtual void Input(void* pContext, + const uint8_t* src_buf, + FX_DWORD src_size) = 0; + + virtual int ReadHeader(void* pContext, + int* width, + int* height, + int* nComps, + CFX_DIBAttribute* pAttribute = NULL) = 0; + + virtual int StartScanline(void* pContext, int down_scale) = 0; + + virtual FX_BOOL ReadScanline(void* pContext, uint8_t* dest_buf) = 0; + + virtual FX_DWORD GetAvailInput(void* pContext, + uint8_t** avail_buf_ptr = NULL) = 0; }; -class ICodec_FaxModule -{ -public: +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 void GetImageInfo(void* ctx, + FX_DWORD& width, + FX_DWORD& height, + FX_DWORD& codestream_nComps, + FX_DWORD& output_nComps) = 0; + + virtual FX_BOOL Decode(void* ctx, + uint8_t* dest_data, + int pitch, + FX_BOOL bTranslateColor, + uint8_t* offsets) = 0; + + virtual void DestroyDecoder(void* ctx) = 0; +}; +class ICodec_PngModule { + public: + virtual ~ICodec_PngModule() {} + + virtual void* Start(void* pModule) = 0; + + virtual void Finish(void* pContext) = 0; - virtual ~ICodec_FaxModule() {} + virtual FX_BOOL Input(void* pContext, + const uint8_t* src_buf, + FX_DWORD src_size, + CFX_DIBAttribute* pAttribute = NULL) = 0; - virtual ICodec_ScanlineDecoder* CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height, - int K, FX_BOOL EndOfLine, FX_BOOL EncodedByteAlign, FX_BOOL BlackIs1, int Columns, int Rows) = 0; + FX_BOOL (*ReadHeaderCallback)(void* pModule, int width, int height, int bpc, int pass, int* color_type, double* gamma); + FX_BOOL (*AskScanlineBufCallback)(void* pModule, int line, uint8_t*& src_buf); - virtual FX_BOOL Encode(const uint8_t* src_buf, int width, int height, int pitch, - uint8_t*& dest_buf, FX_DWORD& dest_size) = 0; + void (*FillScanlineBufCompletedCallback)(void* pModule, int pass, int line); }; -class ICodec_JpegModule -{ -public: +class ICodec_GifModule { + public: + virtual ~ICodec_GifModule() {} - virtual ~ICodec_JpegModule() {} + virtual void* Start(void* pModule) = 0; - virtual void SetPovider(IFX_JpegProvider* pJP) = 0; + virtual void Finish(void* pContext) = 0; - virtual ICodec_ScanlineDecoder* CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size, - int width, int height, int nComps, FX_BOOL ColorTransform) = 0; + virtual FX_DWORD GetAvailInput(void* pContext, + uint8_t** avail_buf_ptr = NULL) = 0; - virtual FX_BOOL LoadInfo(const uint8_t* src_buf, FX_DWORD src_size, int& width, int& height, - int& num_components, int& bits_per_components, FX_BOOL& color_transform, - uint8_t** icc_buf_ptr = NULL, FX_DWORD* icc_length = NULL) = 0; + virtual void Input(void* pContext, + const uint8_t* src_buf, + FX_DWORD src_size) = 0; - virtual FX_BOOL Encode(const class CFX_DIBSource* pSource, uint8_t*& dest_buf, FX_STRSIZE& dest_size, int quality = 75, - const uint8_t* icc_buf = NULL, FX_DWORD icc_length = 0) = 0; + virtual int32_t ReadHeader(void* pContext, + int* width, + int* height, + int* pal_num, + void** pal_pp, + int* bg_index, + CFX_DIBAttribute* pAttribute = NULL) = 0; - virtual void* Start() = 0; + virtual int32_t LoadFrameInfo(void* pContext, int* frame_num) = 0; - virtual void Finish(void* pContext) = 0; + void (*RecordCurrentPositionCallback)(void* pModule, FX_DWORD& cur_pos); - virtual void Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size) = 0; + uint8_t* (*AskLocalPaletteBufCallback)(void* pModule, + int32_t frame_num, + int32_t pal_size); - virtual int ReadHeader(void* pContext, int* width, int* height, int* nComps, CFX_DIBAttribute* pAttribute = NULL) = 0; + virtual int32_t LoadFrame(void* pContext, + int frame_num, + CFX_DIBAttribute* pAttribute = NULL) = 0; + FX_BOOL (*InputRecordPositionBufCallback)(void* pModule, FX_DWORD rcd_pos, const FX_RECT& img_rc, + int32_t pal_num, void* pal_ptr, + int32_t delay_time, FX_BOOL user_input, + int32_t trans_index, int32_t disposal_method, FX_BOOL interlace); - virtual int StartScanline(void* pContext, int down_scale) = 0; + void (*ReadScanlineCallback)(void* pModule, + int32_t row_num, + uint8_t* row_buf); +}; +class ICodec_BmpModule { + public: + virtual ~ICodec_BmpModule() {} + + virtual void* Start(void* pModule) = 0; + + virtual void Finish(void* pContext) = 0; + + virtual FX_DWORD GetAvailInput(void* pContext, + uint8_t** avail_buf_ptr = NULL) = 0; + + virtual void Input(void* pContext, + const uint8_t* src_buf, + FX_DWORD src_size) = 0; + virtual int32_t ReadHeader(void* pContext, + int32_t* width, + int32_t* height, + FX_BOOL* tb_flag, + int32_t* components, + int* pal_num, + FX_DWORD** pal_pp, + CFX_DIBAttribute* pAttribute = NULL) = 0; - virtual FX_BOOL ReadScanline(void* pContext, uint8_t* dest_buf) = 0; + virtual int32_t LoadImage(void* pContext) = 0; + FX_BOOL (*InputImagePositionBufCallback)(void* pModule, FX_DWORD rcd_pos); - virtual FX_DWORD GetAvailInput(void* pContext, uint8_t** avail_buf_ptr = NULL) = 0; + void (*ReadScanlineCallback)(void* pModule, + int32_t row_num, + uint8_t* row_buf); }; -class ICodec_JpxModule -{ -public: +class ICodec_TiffModule { + public: + virtual ~ICodec_TiffModule() {} - virtual ~ICodec_JpxModule() {} + virtual void* CreateDecoder(IFX_FileRead* file_ptr) = 0; - virtual void* CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size, FX_BOOL useColorSpace = FALSE) = 0; + virtual void GetFrames(void* ctx, int32_t& frames) = 0; - virtual void GetImageInfo(void* ctx, FX_DWORD& width, FX_DWORD& height, - FX_DWORD& codestream_nComps, FX_DWORD& output_nComps) = 0; + virtual FX_BOOL LoadFrameInfo(void* ctx, + int32_t frame, + FX_DWORD& width, + FX_DWORD& height, + FX_DWORD& comps, + FX_DWORD& bpc, + CFX_DIBAttribute* pAttribute = NULL) = 0; - virtual FX_BOOL Decode(void* ctx, uint8_t* dest_data, int pitch, - FX_BOOL bTranslateColor, uint8_t* offsets) = 0; + virtual FX_BOOL Decode(void* ctx, class CFX_DIBitmap* pDIBitmap) = 0; - virtual void DestroyDecoder(void* ctx) = 0; + virtual void DestroyDecoder(void* ctx) = 0; }; -class ICodec_PngModule -{ -public: - - virtual ~ICodec_PngModule() {} - - virtual void* Start(void* pModule) = 0; - - virtual void Finish(void* pContext) = 0; - - virtual FX_BOOL Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size, CFX_DIBAttribute* pAttribute = NULL) = 0; - - FX_BOOL (*ReadHeaderCallback)(void* pModule, int width, int height, int bpc, int pass, int* color_type, double* gamma); - - FX_BOOL (*AskScanlineBufCallback)(void* pModule, int line, uint8_t*& src_buf); - - void (*FillScanlineBufCompletedCallback)(void* pModule, int pass, int line); -}; -class ICodec_GifModule -{ -public: - - virtual ~ICodec_GifModule() {} - - virtual void* Start(void* pModule) = 0; - - virtual void Finish(void* pContext) = 0; - - virtual FX_DWORD GetAvailInput(void* pContext, uint8_t** avail_buf_ptr = NULL) = 0; - - virtual void Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size) = 0; - - virtual int32_t ReadHeader(void* pContext, int* width, int* height, - int* pal_num, void** pal_pp, int* bg_index, CFX_DIBAttribute* pAttribute = NULL) = 0; - - virtual int32_t LoadFrameInfo(void* pContext, int* frame_num) = 0; - - void (*RecordCurrentPositionCallback)(void* pModule, FX_DWORD& cur_pos); - - uint8_t* (*AskLocalPaletteBufCallback)(void* pModule, int32_t frame_num, int32_t pal_size); - - virtual int32_t LoadFrame(void* pContext, int frame_num, CFX_DIBAttribute* pAttribute = NULL) = 0; - - FX_BOOL (*InputRecordPositionBufCallback)(void* pModule, FX_DWORD rcd_pos, const FX_RECT& img_rc, - int32_t pal_num, void* pal_ptr, - int32_t delay_time, FX_BOOL user_input, - int32_t trans_index, int32_t disposal_method, FX_BOOL interlace); - - void (*ReadScanlineCallback)(void* pModule, int32_t row_num, uint8_t* row_buf); -}; -class ICodec_BmpModule -{ -public: - - virtual ~ICodec_BmpModule() {} - - virtual void* Start(void* pModule) = 0; - - virtual void Finish(void* pContext) = 0; - - virtual FX_DWORD GetAvailInput(void* pContext, uint8_t** avail_buf_ptr = NULL) = 0; - - virtual void Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size) = 0; - - virtual int32_t ReadHeader(void* pContext, int32_t* width, int32_t* height, FX_BOOL* tb_flag, int32_t* components, - int* pal_num, FX_DWORD** pal_pp, CFX_DIBAttribute* pAttribute = NULL) = 0; - - virtual int32_t LoadImage(void* pContext) = 0; - - FX_BOOL (*InputImagePositionBufCallback)(void* pModule, FX_DWORD rcd_pos); - - void (*ReadScanlineCallback)(void* pModule, int32_t row_num, uint8_t* row_buf); -}; -class ICodec_TiffModule -{ -public: - - virtual ~ICodec_TiffModule() {} - - virtual void* CreateDecoder(IFX_FileRead* file_ptr) = 0; - - - virtual void GetFrames(void* ctx, int32_t& frames) = 0; - - virtual FX_BOOL LoadFrameInfo(void* ctx, int32_t frame, FX_DWORD& width, FX_DWORD& height, FX_DWORD& comps, FX_DWORD& bpc, CFX_DIBAttribute* pAttribute = NULL) = 0; - - - virtual FX_BOOL Decode(void* ctx, class CFX_DIBitmap* pDIBitmap) = 0; - - virtual void DestroyDecoder(void* ctx) = 0; -}; -class ICodec_Jbig2Module -{ -public: - - virtual ~ICodec_Jbig2Module() {} - - virtual FX_BOOL Decode(FX_DWORD width, FX_DWORD height, const uint8_t* src_buf, FX_DWORD src_size, - const uint8_t* global_data, FX_DWORD global_size, uint8_t* dest_buf, FX_DWORD dest_pitch) = 0; - - virtual FX_BOOL Decode(IFX_FileRead* file_ptr, FX_DWORD& width, FX_DWORD& height, - FX_DWORD& pitch, uint8_t*& dest_buf) = 0; - virtual void* CreateJbig2Context() = 0; - - virtual FXCODEC_STATUS StartDecode(void* pJbig2Context, FX_DWORD width, FX_DWORD height, const uint8_t* src_buf, FX_DWORD src_size, - const uint8_t* global_data, FX_DWORD global_size, uint8_t* dest_buf, FX_DWORD dest_pitch, IFX_Pause* pPause) = 0; - - virtual FXCODEC_STATUS StartDecode(void* pJbig2Context, IFX_FileRead* file_ptr, - FX_DWORD& width, FX_DWORD& height, FX_DWORD& pitch, uint8_t*& dest_buf, IFX_Pause* pPause) = 0; - virtual FXCODEC_STATUS ContinueDecode(void* pJbig2Content, IFX_Pause* pPause) = 0; - virtual void DestroyJbig2Context(void* pJbig2Content) = 0; +class ICodec_Jbig2Module { + public: + virtual ~ICodec_Jbig2Module() {} + + virtual FX_BOOL Decode(FX_DWORD width, + FX_DWORD height, + const uint8_t* src_buf, + FX_DWORD src_size, + const uint8_t* global_data, + FX_DWORD global_size, + uint8_t* dest_buf, + FX_DWORD dest_pitch) = 0; + + virtual FX_BOOL Decode(IFX_FileRead* file_ptr, + FX_DWORD& width, + FX_DWORD& height, + FX_DWORD& pitch, + uint8_t*& dest_buf) = 0; + virtual void* CreateJbig2Context() = 0; + + virtual FXCODEC_STATUS StartDecode(void* pJbig2Context, + FX_DWORD width, + FX_DWORD height, + const uint8_t* src_buf, + FX_DWORD src_size, + const uint8_t* global_data, + FX_DWORD global_size, + uint8_t* dest_buf, + FX_DWORD dest_pitch, + IFX_Pause* pPause) = 0; + + virtual FXCODEC_STATUS StartDecode(void* pJbig2Context, + IFX_FileRead* file_ptr, + FX_DWORD& width, + FX_DWORD& height, + FX_DWORD& pitch, + uint8_t*& dest_buf, + IFX_Pause* pPause) = 0; + virtual FXCODEC_STATUS ContinueDecode(void* pJbig2Content, + IFX_Pause* pPause) = 0; + virtual void DestroyJbig2Context(void* pJbig2Content) = 0; }; -class ICodec_ProgressiveDecoder -{ -public: - - virtual ~ICodec_ProgressiveDecoder() {} - - virtual FXCODEC_STATUS LoadImageInfo(IFX_FileRead* pFile, FXCODEC_IMAGE_TYPE imageType = FXCODEC_IMAGE_UNKNOWN, CFX_DIBAttribute* pAttribute = NULL) = 0; - - virtual FXCODEC_IMAGE_TYPE GetType() = 0; - - virtual int32_t GetWidth() = 0; - - virtual int32_t GetHeight() = 0; - - virtual int32_t GetNumComponents() = 0; - - virtual int32_t GetBPC() = 0; - - virtual void SetClipBox(FX_RECT* clip) = 0; - - virtual FXCODEC_STATUS GetFrames(int32_t& frames, IFX_Pause* pPause = NULL) = 0; - - virtual FXCODEC_STATUS StartDecode(class CFX_DIBitmap* pDIBitmap, - int32_t start_x, int32_t start_y, int32_t size_x, int32_t size_y, - int32_t frames = 0, FX_BOOL bInterpol = TRUE) = 0; - - virtual FXCODEC_STATUS ContinueDecode(IFX_Pause* pPause = NULL) = 0; -}; -class ICodec_Jbig2Encoder -{ -public: - - virtual ~ICodec_Jbig2Encoder() {} +class ICodec_ProgressiveDecoder { + public: + virtual ~ICodec_ProgressiveDecoder() {} + + virtual FXCODEC_STATUS LoadImageInfo( + IFX_FileRead* pFile, + FXCODEC_IMAGE_TYPE imageType = FXCODEC_IMAGE_UNKNOWN, + CFX_DIBAttribute* pAttribute = NULL) = 0; + + virtual FXCODEC_IMAGE_TYPE GetType() = 0; + + virtual int32_t GetWidth() = 0; + + virtual int32_t GetHeight() = 0; + + virtual int32_t GetNumComponents() = 0; + + virtual int32_t GetBPC() = 0; + + virtual void SetClipBox(FX_RECT* clip) = 0; + + virtual FXCODEC_STATUS GetFrames(int32_t& frames, + IFX_Pause* pPause = NULL) = 0; + + virtual FXCODEC_STATUS StartDecode(class CFX_DIBitmap* pDIBitmap, + int32_t start_x, + int32_t start_y, + int32_t size_x, + int32_t size_y, + int32_t frames = 0, + FX_BOOL bInterpol = TRUE) = 0; + + virtual FXCODEC_STATUS ContinueDecode(IFX_Pause* pPause = NULL) = 0; +}; +class ICodec_Jbig2Encoder { + public: + virtual ~ICodec_Jbig2Encoder() {} }; -class ICodec_IccModule -{ -public: - typedef enum { - IccCS_Unknown = 0, - IccCS_XYZ, - IccCS_Lab, - IccCS_Luv, - IccCS_YCbCr, - IccCS_Yxy, - IccCS_Hsv, - IccCS_Hls, - IccCS_Gray, - IccCS_Rgb, - IccCS_Cmyk, - IccCS_Cmy - } IccCS; - typedef struct _IccParam { - FX_DWORD Version; - IccCS ColorSpace; - FX_DWORD dwProfileType; - FX_DWORD dwFormat; - uint8_t* pProfileData; - FX_DWORD dwProfileSize; - double Gamma; - } IccParam; - - virtual ~ICodec_IccModule() {} - - virtual IccCS GetProfileCS(const uint8_t* pProfileData, unsigned int dwProfileSize) = 0; - - virtual IccCS GetProfileCS(IFX_FileRead* pFile) = 0; - - virtual void* CreateTransform(ICodec_IccModule::IccParam* pInputParam, - ICodec_IccModule::IccParam* pOutputParam, - ICodec_IccModule::IccParam* pProofParam = NULL, - FX_DWORD dwIntent = Icc_INTENT_PERCEPTUAL, - FX_DWORD dwFlag = Icc_FLAGS_DEFAULT, - FX_DWORD dwPrfIntent = Icc_INTENT_ABSOLUTE_COLORIMETRIC, - FX_DWORD dwPrfFlag = Icc_FLAGS_SOFTPROOFING - ) = 0; - - - virtual void* CreateTransform_sRGB(const uint8_t* pProfileData, FX_DWORD dwProfileSize, int32_t& nComponents, int32_t intent = 0, - FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT) = 0; - - virtual void* CreateTransform_CMYK(const uint8_t* pSrcProfileData, FX_DWORD dwSrcProfileSize, int32_t& nSrcComponents, - const uint8_t* pDstProfileData, FX_DWORD dwDstProfileSize, int32_t intent = 0, - FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT, - FX_DWORD dwDstFormat = Icc_FORMAT_DEFAULT - ) = 0; - - virtual void DestroyTransform(void* pTransform) = 0; - - virtual void Translate(void* pTransform, FX_FLOAT* pSrcValues, FX_FLOAT* pDestValues) = 0; - - virtual void TranslateScanline(void* pTransform, uint8_t* pDest, const uint8_t* pSrc, int pixels) = 0; - virtual void SetComponents(FX_DWORD nComponents) = 0; +class ICodec_IccModule { + public: + typedef enum { + IccCS_Unknown = 0, + IccCS_XYZ, + IccCS_Lab, + IccCS_Luv, + IccCS_YCbCr, + IccCS_Yxy, + IccCS_Hsv, + IccCS_Hls, + IccCS_Gray, + IccCS_Rgb, + IccCS_Cmyk, + IccCS_Cmy + } IccCS; + typedef struct _IccParam { + FX_DWORD Version; + IccCS ColorSpace; + FX_DWORD dwProfileType; + FX_DWORD dwFormat; + uint8_t* pProfileData; + FX_DWORD dwProfileSize; + double Gamma; + } IccParam; + + virtual ~ICodec_IccModule() {} + + virtual IccCS GetProfileCS(const uint8_t* pProfileData, + unsigned int dwProfileSize) = 0; + + virtual IccCS GetProfileCS(IFX_FileRead* pFile) = 0; + + virtual void* CreateTransform( + ICodec_IccModule::IccParam* pInputParam, + ICodec_IccModule::IccParam* pOutputParam, + ICodec_IccModule::IccParam* pProofParam = NULL, + FX_DWORD dwIntent = Icc_INTENT_PERCEPTUAL, + FX_DWORD dwFlag = Icc_FLAGS_DEFAULT, + FX_DWORD dwPrfIntent = Icc_INTENT_ABSOLUTE_COLORIMETRIC, + FX_DWORD dwPrfFlag = Icc_FLAGS_SOFTPROOFING) = 0; + + virtual void* CreateTransform_sRGB( + const uint8_t* pProfileData, + FX_DWORD dwProfileSize, + int32_t& nComponents, + int32_t intent = 0, + FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT) = 0; + + virtual void* CreateTransform_CMYK( + const uint8_t* pSrcProfileData, + FX_DWORD dwSrcProfileSize, + int32_t& nSrcComponents, + const uint8_t* pDstProfileData, + FX_DWORD dwDstProfileSize, + int32_t intent = 0, + FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT, + FX_DWORD dwDstFormat = Icc_FORMAT_DEFAULT) = 0; + + virtual void DestroyTransform(void* pTransform) = 0; + + virtual void Translate(void* pTransform, + FX_FLOAT* pSrcValues, + FX_FLOAT* pDestValues) = 0; + + virtual void TranslateScanline(void* pTransform, + uint8_t* pDest, + const uint8_t* pSrc, + int pixels) = 0; + virtual void SetComponents(FX_DWORD nComponents) = 0; }; -void AdobeCMYK_to_sRGB(FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B); -void AdobeCMYK_to_sRGB1(uint8_t c, uint8_t m, uint8_t y, uint8_t k, uint8_t& R, uint8_t& G, uint8_t& B); +void AdobeCMYK_to_sRGB(FX_FLOAT c, + FX_FLOAT m, + FX_FLOAT y, + FX_FLOAT k, + FX_FLOAT& R, + FX_FLOAT& G, + FX_FLOAT& B); +void AdobeCMYK_to_sRGB1(uint8_t c, + uint8_t m, + uint8_t y, + uint8_t k, + uint8_t& R, + uint8_t& G, + uint8_t& B); FX_BOOL MD5ComputeID(const void* buf, FX_DWORD dwSize, uint8_t ID[16]); -class CFX_DIBAttribute -{ -public: - CFX_DIBAttribute(); - ~CFX_DIBAttribute(); - - int32_t m_nXDPI; - - int32_t m_nYDPI; - - FX_FLOAT m_fAspectRatio; - - FX_WORD m_wDPIUnit; - - CFX_ByteString m_strAuthor; - - uint8_t m_strTime[20]; - - int32_t m_nGifLeft; - int32_t m_nGifTop; - - FX_DWORD* m_pGifLocalPalette; - - FX_DWORD m_nGifLocalPalNum; - - int32_t m_nBmpCompressType; - class IFX_DIBAttributeExif* m_pExif; -}; -class IFX_DIBAttributeExif -{ -public: - virtual ~IFX_DIBAttributeExif() {}; - virtual FX_BOOL GetInfo(FX_WORD tag, void* val) = 0; -}; +class CFX_DIBAttribute { + public: + CFX_DIBAttribute(); + ~CFX_DIBAttribute(); + + int32_t m_nXDPI; + + int32_t m_nYDPI; + + FX_FLOAT m_fAspectRatio; + + FX_WORD m_wDPIUnit; + + CFX_ByteString m_strAuthor; + + uint8_t m_strTime[20]; + + int32_t m_nGifLeft; + int32_t m_nGifTop; + + FX_DWORD* m_pGifLocalPalette; + + FX_DWORD m_nGifLocalPalNum; + + int32_t m_nBmpCompressType; + class IFX_DIBAttributeExif* m_pExif; +}; +class IFX_DIBAttributeExif { + public: + virtual ~IFX_DIBAttributeExif(){}; + virtual FX_BOOL GetInfo(FX_WORD tag, void* val) = 0; +}; #endif // CORE_INCLUDE_FXCODEC_FX_CODEC_H_ diff --git a/core/include/fxcodec/fx_codec_def.h b/core/include/fxcodec/fx_codec_def.h index 36a5e0d2c2..1cb5909658 100644 --- a/core/include/fxcodec/fx_codec_def.h +++ b/core/include/fxcodec/fx_codec_def.h @@ -8,81 +8,81 @@ #define CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_ enum FXCODEC_IMAGE_TYPE { - FXCODEC_IMAGE_UNKNOWN = 0, - FXCODEC_IMAGE_BMP, - FXCODEC_IMAGE_JPG, - FXCODEC_IMAGE_PNG, - FXCODEC_IMAGE_GIF, - FXCODEC_IMAGE_TIF, - FXCODEC_IMAGE_MAX + FXCODEC_IMAGE_UNKNOWN = 0, + FXCODEC_IMAGE_BMP, + FXCODEC_IMAGE_JPG, + FXCODEC_IMAGE_PNG, + FXCODEC_IMAGE_GIF, + FXCODEC_IMAGE_TIF, + FXCODEC_IMAGE_MAX }; enum FXCODEC_STATUS { - FXCODEC_STATUS_ERROR = -1, - FXCODEC_STATUS_FRAME_READY, - FXCODEC_STATUS_FRAME_TOBECONTINUE, - FXCODEC_STATUS_DECODE_READY, - FXCODEC_STATUS_DECODE_TOBECONTINUE, - FXCODEC_STATUS_DECODE_FINISH, - FXCODEC_STATUS_ERR_MEMORY, - FXCODEC_STATUS_ERR_READ, - FXCODEC_STATUS_ERR_FLUSH, - FXCODEC_STATUS_ERR_FORMAT, - FXCODEC_STATUS_ERR_PARAMS + FXCODEC_STATUS_ERROR = -1, + FXCODEC_STATUS_FRAME_READY, + FXCODEC_STATUS_FRAME_TOBECONTINUE, + FXCODEC_STATUS_DECODE_READY, + FXCODEC_STATUS_DECODE_TOBECONTINUE, + FXCODEC_STATUS_DECODE_FINISH, + FXCODEC_STATUS_ERR_MEMORY, + FXCODEC_STATUS_ERR_READ, + FXCODEC_STATUS_ERR_FLUSH, + FXCODEC_STATUS_ERR_FORMAT, + FXCODEC_STATUS_ERR_PARAMS }; -#define JP2_SPACE_INVALID -1 -#define JPX_SPACE_INVALID -1 -#define JP2_SPACE_bilevel1 0 -#define JP2_SPACE_YCbCr1 1 -#define JP2_SPACE_YCbCr2 3 -#define JP2_SPACE_YCbCr3 4 -#define JP2_SPACE_PhotoYCC 9 -#define JP2_SPACE_CMY 11 -#define JP2_SPACE_CMYK 12 -#define JP2_SPACE_YCCK 13 -#define JP2_SPACE_CIELab 14 -#define JP2_SPACE_bilevel2 15 -#define JP2_SPACE_sRGB 16 -#define JP2_SPACE_sLUM 17 -#define JP2_SPACE_sYCC 18 -#define JP2_SPACE_CIEJab 19 -#define JP2_SPACE_esRGB 20 -#define JP2_SPACE_ROMMRGB 21 -#define JP2_SPACE_YPbPr60 22 -#define JP2_SPACE_YPbPr50 23 -#define JP2_SPACE_esYCC 24 -#define JP2_SPACE_iccLUM 100 -#define JP2_SPACE_iccRGB 101 -#define Icc_INTENT_PERCEPTUAL 0 -#define Icc_INTENT_RELATIVE_COLORIMETRIC 1 -#define Icc_INTENT_SATURATION 2 -#define Icc_INTENT_ABSOLUTE_COLORIMETRIC 3 -#define Icc_FORMAT_DEFAULT 0 -#define Icc_FORMAT_SWAP (1<<10) -#define Icc_FLAGS_DEFAULT 0x0000 -#define Icc_FLAGS_BLACKPOINTCOMPENSATION 0x2000 -#define Icc_FLAGS_NOWHITEONWHITEFIXUP 0x0004 -#define Icc_FLAGS_HIGHRESPRECALC 0x0400 -#define Icc_FLAGS_LOWRESPRECALC 0x0800 -#define Icc_FLAGS_GAMUTCHECK 0x1000 -#define Icc_FLAGS_SOFTPROOFING 0x4000 -#define Icc_PARAMTYPE_NONE 0 -#define Icc_PARAMTYPE_BUFFER 1 -#define Icc_PARAMTYPE_PARAM 2 +#define JP2_SPACE_INVALID -1 +#define JPX_SPACE_INVALID -1 +#define JP2_SPACE_bilevel1 0 +#define JP2_SPACE_YCbCr1 1 +#define JP2_SPACE_YCbCr2 3 +#define JP2_SPACE_YCbCr3 4 +#define JP2_SPACE_PhotoYCC 9 +#define JP2_SPACE_CMY 11 +#define JP2_SPACE_CMYK 12 +#define JP2_SPACE_YCCK 13 +#define JP2_SPACE_CIELab 14 +#define JP2_SPACE_bilevel2 15 +#define JP2_SPACE_sRGB 16 +#define JP2_SPACE_sLUM 17 +#define JP2_SPACE_sYCC 18 +#define JP2_SPACE_CIEJab 19 +#define JP2_SPACE_esRGB 20 +#define JP2_SPACE_ROMMRGB 21 +#define JP2_SPACE_YPbPr60 22 +#define JP2_SPACE_YPbPr50 23 +#define JP2_SPACE_esYCC 24 +#define JP2_SPACE_iccLUM 100 +#define JP2_SPACE_iccRGB 101 +#define Icc_INTENT_PERCEPTUAL 0 +#define Icc_INTENT_RELATIVE_COLORIMETRIC 1 +#define Icc_INTENT_SATURATION 2 +#define Icc_INTENT_ABSOLUTE_COLORIMETRIC 3 +#define Icc_FORMAT_DEFAULT 0 +#define Icc_FORMAT_SWAP (1 << 10) +#define Icc_FLAGS_DEFAULT 0x0000 +#define Icc_FLAGS_BLACKPOINTCOMPENSATION 0x2000 +#define Icc_FLAGS_NOWHITEONWHITEFIXUP 0x0004 +#define Icc_FLAGS_HIGHRESPRECALC 0x0400 +#define Icc_FLAGS_LOWRESPRECALC 0x0800 +#define Icc_FLAGS_GAMUTCHECK 0x1000 +#define Icc_FLAGS_SOFTPROOFING 0x4000 +#define Icc_PARAMTYPE_NONE 0 +#define Icc_PARAMTYPE_BUFFER 1 +#define Icc_PARAMTYPE_PARAM 2 enum FXCODEC_RESUNIT { - FXCODEC_RESUNIT_NONE = 0, - FXCODEC_RESUNIT_INCH, - FXCODEC_RESUNIT_CENTIMETER, - FXCODEC_RESUNIT_METER + FXCODEC_RESUNIT_NONE = 0, + FXCODEC_RESUNIT_INCH, + FXCODEC_RESUNIT_CENTIMETER, + FXCODEC_RESUNIT_METER }; -#define EXIFTAG_USHORT_RESUNIT 296 -#define EXIFTAG_FLOAT_DPIX 282 -#define EXIFTAG_FLOAT_DPIY 283 -#define EXIFTAG_USHORT_ORIENTATION 274 -#define EXIFTAG_STRING_MANUFACTURER 271 -#define EXIFTAG_STRING_MODULE 272 -#define EXIFTAG_STRING_SOFTWARE 305 -#define EXIFTAG_STRING_IAMGEDESCRIPTION 270 -#define EXIFTAG_STRING_DATETIME 306 -#define EXIFTAG_STRING_COPYRIGHT 33432 +#define EXIFTAG_USHORT_RESUNIT 296 +#define EXIFTAG_FLOAT_DPIX 282 +#define EXIFTAG_FLOAT_DPIY 283 +#define EXIFTAG_USHORT_ORIENTATION 274 +#define EXIFTAG_STRING_MANUFACTURER 271 +#define EXIFTAG_STRING_MODULE 272 +#define EXIFTAG_STRING_SOFTWARE 305 +#define EXIFTAG_STRING_IAMGEDESCRIPTION 270 +#define EXIFTAG_STRING_DATETIME 306 +#define EXIFTAG_STRING_COPYRIGHT 33432 #endif // CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_ diff --git a/core/include/fxcodec/fx_codec_flate.h b/core/include/fxcodec/fx_codec_flate.h index 8495a37496..7d0106139e 100644 --- a/core/include/fxcodec/fx_codec_flate.h +++ b/core/include/fxcodec/fx_codec_flate.h @@ -13,9 +13,11 @@ extern "C" { // Note: Some of these return Z_* status codes from zlib.h. void* FPDFAPI_FlateInit(void* (*alloc_func)(void*, unsigned int, unsigned int), void (*free_func)(void*, void*)); -void FPDFAPI_FlateInput(void* context, const unsigned char* src_buf, +void FPDFAPI_FlateInput(void* context, + const unsigned char* src_buf, unsigned int src_size); -int FPDFAPI_FlateOutput(void* context, unsigned char* dest_buf, +int FPDFAPI_FlateOutput(void* context, + unsigned char* dest_buf, unsigned int dest_size); int FPDFAPI_FlateGetAvailIn(void* context); int FPDFAPI_FlateGetAvailOut(void* context); diff --git a/core/include/fxcodec/fx_codec_provider.h b/core/include/fxcodec/fx_codec_provider.h index a465fe2460..bd4db44c89 100644 --- a/core/include/fxcodec/fx_codec_provider.h +++ b/core/include/fxcodec/fx_codec_provider.h @@ -11,50 +11,67 @@ class CFX_DIBAttribute; -class IFX_JpegProvider -{ -public: - virtual void Release() = 0; +class IFX_JpegProvider { + public: + virtual void Release() = 0; - virtual void* CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height, int nComps, FX_BOOL ColorTransform) = 0; + virtual void* CreateDecoder(const uint8_t* src_buf, + FX_DWORD src_size, + int width, + int height, + int nComps, + FX_BOOL ColorTransform) = 0; + virtual void DestroyDecoder(void* pDecoder) = 0; - virtual void DestroyDecoder(void* pDecoder) = 0; + virtual void DownScale(void* pDecoder, int dest_width, int dest_height) = 0; - virtual void DownScale(void* pDecoder, int dest_width, int dest_height) = 0; + virtual FX_BOOL Rewind(void* pDecoder) = 0; - virtual FX_BOOL Rewind(void* pDecoder) = 0; + virtual uint8_t* GetNextLine(void* pDecoder) = 0; - virtual uint8_t* GetNextLine(void* pDecoder) = 0; + virtual FX_DWORD GetSrcOffset(void* pDecoder) = 0; - virtual FX_DWORD GetSrcOffset(void* pDecoder) = 0; + virtual FX_BOOL LoadInfo(const uint8_t* src_buf, + FX_DWORD src_size, + int& width, + int& height, + int& num_components, + int& bits_per_components, + FX_BOOL& color_transform, + uint8_t** icc_buf_ptr = NULL, + FX_DWORD* icc_length = NULL) = 0; + virtual FX_BOOL Encode(const class CFX_DIBSource* pSource, + uint8_t*& dest_buf, + FX_STRSIZE& dest_size, + int quality = 75, + const uint8_t* icc_buf = NULL, + FX_DWORD icc_length = 0) = 0; - virtual FX_BOOL LoadInfo(const uint8_t* src_buf, FX_DWORD src_size, int& width, int& height, - int& num_components, int& bits_per_components, FX_BOOL& color_transform, - uint8_t** icc_buf_ptr = NULL, FX_DWORD* icc_length = NULL) = 0; + virtual void* Start() = 0; - virtual FX_BOOL Encode(const class CFX_DIBSource* pSource, uint8_t*& dest_buf, FX_STRSIZE& dest_size, int quality = 75, - const uint8_t* icc_buf = NULL, FX_DWORD icc_length = 0) = 0; + virtual void Finish(void* pContext) = 0; - virtual void* Start() = 0; + virtual void Input(void* pContext, + const uint8_t* src_buf, + FX_DWORD src_size) = 0; - virtual void Finish(void* pContext) = 0; + virtual int ReadHeader(void* pContext, + int* width, + int* height, + int* nComps, + CFX_DIBAttribute* pAttribute = NULL) = 0; - virtual void Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size) = 0; + virtual int StartScanline(void* pContext, int down_scale) = 0; - virtual int ReadHeader(void* pContext, int* width, int* height, int* nComps, CFX_DIBAttribute* pAttribute = NULL) = 0; + virtual FX_BOOL ReadScanline(void* pContext, uint8_t* dest_buf) = 0; - virtual int StartScanline(void* pContext, int down_scale) = 0; + virtual FX_DWORD GetAvailInput(void* pContext, + uint8_t** avail_buf_ptr = NULL) = 0; - - virtual FX_BOOL ReadScanline(void* pContext, uint8_t* dest_buf) = 0; - - - virtual FX_DWORD GetAvailInput(void* pContext, uint8_t** avail_buf_ptr = NULL) = 0; - -protected: - ~IFX_JpegProvider() { } + protected: + ~IFX_JpegProvider() {} }; #endif // CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_ -- cgit v1.2.3