diff options
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fxcodec/fx_codec.h | 14 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index b3133694b8..625ec08e7d 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -7,6 +7,8 @@ #ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_H_ #define CORE_INCLUDE_FXCODEC_FX_CODEC_H_ +#include <vector> + #include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_basic.h" #include "fx_codec_def.h" @@ -64,6 +66,7 @@ class ICodec_BasicModule { int nComps, int bpc) = 0; }; + class ICodec_ScanlineDecoder { public: virtual ~ICodec_ScanlineDecoder() {} @@ -72,7 +75,7 @@ class ICodec_ScanlineDecoder { virtual void DownScale(int dest_width, int dest_height) = 0; - virtual uint8_t* GetScanline(int line) = 0; + virtual const uint8_t* GetScanline(int line) = 0; virtual FX_BOOL SkipToScanline(int line, IFX_Pause* pPause) = 0; @@ -88,6 +91,7 @@ class ICodec_ScanlineDecoder { virtual void ClearImageData() = 0; }; + class ICodec_FlateModule { public: virtual ~ICodec_FlateModule() {} @@ -211,10 +215,10 @@ class ICodec_JpxModule { FX_DWORD* height, FX_DWORD* components) = 0; - virtual FX_BOOL Decode(CJPX_Decoder* pDecoder, - uint8_t* dest_data, - int pitch, - uint8_t* offsets) = 0; + virtual bool Decode(CJPX_Decoder* pDecoder, + uint8_t* dest_data, + int pitch, + const std::vector<uint8_t>& offsets) = 0; virtual void DestroyDecoder(CJPX_Decoder* pDecoder) = 0; }; diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 3e556f5439..7412b8db3c 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -947,6 +947,10 @@ class CFX_AutoRestorer { T m_OldValue; }; +struct FxFreeDeleter { + inline void operator()(void* ptr) const { FX_Free(ptr); } +}; + // Used with nonstd::unique_ptr to Release() objects that can't be deleted. template <class T> struct ReleaseDeleter { |