diff options
| author | Memphiz <memphis@machzwo.de> | 2015-01-27 20:38:40 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2015-01-27 20:38:40 +0100 |
| commit | e0952cac7c20bef2d292f13b546109a17582b592 (patch) | |
| tree | 055ce6a27729ba046a88995887bb26181877b734 /tools | |
| parent | a789eac996faa8460abd36cb4132e22ae149778e (diff) | |
[depends/TexturePacker] - fix extraction of delay and disposal from animated gifs (wrong assumption what ExtensionBlockCount was ...) - add delay as printout too
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/native/TexturePacker/src/TexturePacker.cpp | 2 | ||||
| -rw-r--r-- | tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/depends/native/TexturePacker/src/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp index a84a4606ef..9d093f280d 100644 --- a/tools/depends/native/TexturePacker/src/TexturePacker.cpp +++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp @@ -385,7 +385,7 @@ int createBundle(const std::string& InputDir, const std::string& OutputFile, dou { for (unsigned int j = 0; j < frames.frameList.size(); j++) { - printf(" frame %4i ", j); + printf(" frame %4i (delay:%4i) ", j, frames.frameList[j].delay); CXBTFFrame frame = createXBTFFrame(frames.frameList[j].rgbaImage, writer, maxMSE, flags); frame.SetDuration(frames.frameList[j].delay); file.GetFrames().push_back(frame); diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp index 5529160116..45a5a5e784 100644 --- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp +++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp @@ -294,7 +294,7 @@ bool GifHelper::gcbToFrame(GifFrame &frame, unsigned int imgIdx) frame.m_delay = 0; frame.m_disposal = 0; #if GIFLIB_MAJOR >= 5 - if (m_gif->ExtensionBlockCount > 0) + if (m_gif->ImageCount > 0) { GraphicsControlBlock gcb; if (!DGifSavedExtensionToGCB(m_gif, imgIdx, &gcb)) |