mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-11 18:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs saving a palette in an image file (fix #1239)

Browse Source 
* We cannot use an index greater than the palette size when we save a
  PNG file.
* Now we don't create an image bigger than the needed palette size.
* We use a background layer so the transparent index is not set with
  alpha=0 in the PNG encoder.
This commit is contained in:
David Capello 2016-09-12 12:56:00 -03:00
parent 3333855db3
commit 5293d9cce5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/file/palette_file.cpp
View File

@ -114,7 +114,7 @@ bool save_palette(const char *filename, const Palette* pal, int columns)
else { else {
FileFormat* ff = FileFormatsManager::instance()->getFileFormatByExtension(ext.c_str()); FileFormat* ff = FileFormatsManager::instance()->getFileFormatByExtension(ext.c_str());
if (ff && ff->support(FILE_SUPPORT_SAVE)) { if (ff && ff->support(FILE_SUPPORT_SAVE)) {
int w = (columns > 0 ? columns: pal->size()); int w = (columns > 0 ? MID(0, columns, pal->size()): pal->size());
int h = (pal->size() / w) + (pal->size() % w > 0 ? 1: 0); int h = (pal->size() / w) + (pal->size() % w > 0 ? 1: 0);
app::Context tmpContext; app::Context tmpContext;
@ -125,18 +125,25 @@ bool save_palette(const char *filename, const Palette* pal, int columns)
Sprite* sprite = doc->sprite(); Sprite* sprite = doc->sprite();
doc->sprite()->setPalette(pal, false); doc->sprite()->setPalette(pal, false);
Layer* layer = sprite->folder()->getFirstLayer(); LayerImage* layer = static_cast<LayerImage*>(sprite->folder()->getFirstLayer());
layer->configureAsBackground();
Image* image = layer->cel(frame_t(0))->image(); Image* image = layer->cel(frame_t(0))->image();
image->clear(0);
int x, y, c; int x, y, c;
for (y=c=0; y<h; ++y) { for (y=c=0; y<h; ++y) {
for (x=0; x<w; ++x, ++c) { for (x=0; x<w; ++x) {
if (doc->colorMode() == doc::ColorMode::INDEXED) if (doc->colorMode() == doc::ColorMode::INDEXED)
image->putPixel(x, y, c); image->putPixel(x, y, c);
else else
image->putPixel(x, y, pal->entry(c)); image->putPixel(x, y, pal->entry(c));
if (++c == pal->size())
goto done;
} }
} }
done:;
doc->setFilename(filename); doc->setFilename(filename);
success = (save_document(&tmpContext, doc) == 0); success = (save_document(&tmpContext, doc) == 0);