mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-03 23:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug saving invalid .gif files when we use an indexed image with more than 256 colors

Browse Source
This commit is contained in:
David Capello 2015-07-30 18:46:56 -03:00
parent 4a1356cf78
commit fba9213c9c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/file/gif_format.cpp
View File

@ -46,6 +46,9 @@
#define GifBitSize BitSize #define GifBitSize BitSize
#endif #endif
// GifBitSize can return 9 (it's a bug in giflib)
#define GifBitSizeLimited(v) (MIN(GifBitSize(v), 8))
namespace app { namespace app {
using namespace base; using namespace base;
@ -682,7 +685,7 @@ public:
if (m_sprite->pixelFormat() == IMAGE_INDEXED) { if (m_sprite->pixelFormat() == IMAGE_INDEXED) {
for (Palette* palette : m_sprite->getPalettes()) { for (Palette* palette : m_sprite->getPalettes()) {
int bpp = GifBitSize(palette->size()); int bpp = GifBitSizeLimited(palette->size());
m_bitsPerPixel = MAX(m_bitsPerPixel, bpp); m_bitsPerPixel = MAX(m_bitsPerPixel, bpp);
} }
} }
@ -964,7 +967,7 @@ private:
} }
int usedNColors = usedColors.picks(); int usedNColors = usedColors.picks();
int localColorCount = (1 << GifBitSize(usedNColors)); int localColorCount = (1 << GifBitSizeLimited(usedNColors));
Remap remap(256); Remap remap(256);
for (int i=0; i<remap.size(); ++i) for (int i=0; i<remap.size(); ++i)
@ -1065,7 +1068,7 @@ private:
private: private:
static ColorMapObject* createColorMap(const Palette* palette) { static ColorMapObject* createColorMap(const Palette* palette) {
int n = 1 << GifBitSize(palette->size()); int n = 1 << GifBitSizeLimited(palette->size());
ColorMapObject* colormap = GifMakeMapObject(n, nullptr); ColorMapObject* colormap = GifMakeMapObject(n, nullptr);
for (int i=0; i<n; ++i) { for (int i=0; i<n; ++i) {