diff options
Diffstat (limited to 'core/fxcodec/gif')
-rw-r--r-- | core/fxcodec/gif/cfx_gif.cpp | 4 | ||||
-rw-r--r-- | core/fxcodec/gif/cfx_gif.h | 7 | ||||
-rw-r--r-- | core/fxcodec/gif/cfx_lzwdecompressor.h | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/core/fxcodec/gif/cfx_gif.cpp b/core/fxcodec/gif/cfx_gif.cpp index 18d474ba9a..efe4f4b03a 100644 --- a/core/fxcodec/gif/cfx_gif.cpp +++ b/core/fxcodec/gif/cfx_gif.cpp @@ -29,3 +29,7 @@ static_assert(sizeof(GifApplicationExtension) == 12, "GifApplicationExtension should have a size of 12"); static_assert(sizeof(CFX_GifPalette) == 3, "CFX_GifPalette should have a size of 3"); + +CFX_GifImage::CFX_GifImage() = default; + +CFX_GifImage::~CFX_GifImage() = default; diff --git a/core/fxcodec/gif/cfx_gif.h b/core/fxcodec/gif/cfx_gif.h index dd0d719bcf..9ca7211997 100644 --- a/core/fxcodec/gif/cfx_gif.h +++ b/core/fxcodec/gif/cfx_gif.h @@ -116,7 +116,10 @@ enum class CFX_GifDecodeStatus { InsufficientDestSize, // Only used internally by CGifLZWDecoder::Decode() }; -typedef struct { +struct CFX_GifImage { + CFX_GifImage(); + ~CFX_GifImage(); + std::unique_ptr<CFX_GifGraphicControlExtension> image_GCE; std::vector<CFX_GifPalette> local_palettes; std::vector<uint8_t> row_buffer; @@ -125,6 +128,6 @@ typedef struct { uint8_t code_exp; uint32_t data_pos; int32_t row_num; -} CFX_GifImage; +}; #endif // CORE_FXCODEC_GIF_CFX_GIF_H_ diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.h b/core/fxcodec/gif/cfx_lzwdecompressor.h index f4df065e34..d3ec588de1 100644 --- a/core/fxcodec/gif/cfx_lzwdecompressor.h +++ b/core/fxcodec/gif/cfx_lzwdecompressor.h @@ -14,10 +14,10 @@ class CFX_LZWDecompressor { public: - typedef struct { + struct CodeEntry { uint16_t prefix; uint8_t suffix; - } CodeEntry; + }; // Returns nullptr on error static std::unique_ptr<CFX_LZWDecompressor> Create(uint8_t color_exp, |