TexturePacker: GIFDecoder: pass filename as std::string

Signed-off-by: Lukas Rusak <lorusak@gmail.com>

3 files changed, 6 insertions, 7 deletions

diff --git a/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.cpp
index 468bc754d1..f804f3dbea 100644
--- a/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.cpp
+++ b/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.cpp
@@ -36,7 +36,7 @@ bool GIFDecoder::LoadFile(const std::string &filename, DecodedFrames &frames)
   bool result = false;
 
   GifHelper gifImage;
-  if (gifImage.LoadGif(filename.c_str()))
+  if (gifImage.LoadGif(filename))
   {
     auto extractedFrames = gifImage.GetFrames();
     n = extractedFrames.size();
diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
index 41ca2704a5..29329d94e9 100644
--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
@@ -174,7 +174,7 @@ bool GifHelper::LoadGifMetaData(GifFileType* gif)
   return true;
 }
 
-bool GifHelper::LoadGifMetaData(const char* file)
+bool GifHelper::LoadGifMetaData(const std::string& file)
 {
   m_gifFile->Close();
   if (!m_gifFile->Open(file) || !Open(m_gif, m_gifFile, ReadFromVfs))
@@ -200,10 +200,10 @@ bool GifHelper::Slurp(GifFileType* gif)
   return true;
 }
 
-bool GifHelper::LoadGif(const char* file)
+bool GifHelper::LoadGif(const std::string& file)
 {
   m_filename = file;
-  if (!LoadGifMetaData(m_filename.c_str()))
+  if (!LoadGifMetaData(m_filename))
     return false;
 
   try
diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.h b/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
index 1e897a7e41..fff7533ef5 100644
--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
@@ -90,8 +90,7 @@ public:
   GifHelper();
   virtual ~GifHelper();
 
-
-  bool LoadGif(const char* file);
+  bool LoadGif(const std::string& file);
 
   std::vector<FramePtr>& GetFrames() { return m_frames; }
   unsigned int GetPitch() const { return m_pitch; }
@@ -120,7 +119,7 @@ private:
 
   const char* Reason(int reason);
 
-  bool LoadGifMetaData(const char* file);
+  bool LoadGifMetaData(const std::string& file);
   bool Slurp(GifFileType* gif);
   void InitTemplateAndColormap();
   bool LoadGifMetaData(GifFileType* gif);