aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/native/TexturePacker/src
diff options
context:
space:
mode:
authorLukas Rusak <lorusak@gmail.com>2023-04-13 11:19:47 -0700
committerLukas Rusak <lorusak@gmail.com>2023-04-23 21:03:15 -0700
commitceef221e04465b684163e941011f16c7025ff85c (patch)
tree1d090dd9a358d7abe6dcbe2fc1b19108f5235053 /tools/depends/native/TexturePacker/src
parent4779eef75c9d71c40dcc3200a4e7b1f8c9f43117 (diff)
TexturePacker: GifHelper: use CFile as an object
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
Diffstat (limited to 'tools/depends/native/TexturePacker/src')
-rw-r--r--tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp10
-rw-r--r--tools/depends/native/TexturePacker/src/decoder/GifHelper.h4
2 files changed, 4 insertions, 10 deletions
diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
index 29329d94e9..b339a979de 100644
--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
@@ -43,16 +43,10 @@ int ReadFromVfs(GifFileType* gif, GifByteType* gifbyte, int len)
return gifFile->Read(gifbyte, len);
}
-GifHelper::GifHelper()
-{
- m_gifFile = new CFile();
-}
-
GifHelper::~GifHelper()
{
Close(m_gif);
Release();
- delete m_gifFile;
}
bool GifHelper::Open(GifFileType*& gif, void *dataPtr, InputFunc readFunc)
@@ -176,8 +170,8 @@ bool GifHelper::LoadGifMetaData(GifFileType* gif)
bool GifHelper::LoadGifMetaData(const std::string& file)
{
- m_gifFile->Close();
- if (!m_gifFile->Open(file) || !Open(m_gif, m_gifFile, ReadFromVfs))
+ m_gifFile.Close();
+ if (!m_gifFile.Open(file) || !Open(m_gif, &m_gifFile, ReadFromVfs))
return false;
return LoadGifMetaData(m_gif);
diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.h b/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
index fff7533ef5..9704b1dd8d 100644
--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
@@ -87,7 +87,7 @@ class GifHelper
typedef std::shared_ptr<GifFrame> FramePtr;
public:
- GifHelper();
+ GifHelper() = default;
virtual ~GifHelper();
bool LoadGif(const std::string& file);
@@ -109,7 +109,7 @@ private:
GifFileType* m_gif = nullptr;
std::vector<GifColor> m_globalPalette;
unsigned char* m_pTemplate = nullptr;
- CFile* m_gifFile;
+ CFile m_gifFile;
unsigned int m_width;
unsigned int m_height;