mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 13:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix convert_imgtype from Indexed to RGB when the first palette entry is not black (is not transparent color).

Browse Source
This commit is contained in:
David Capello 2011-01-14 18:29:25 -03:00
parent 864d13fb40
commit 68a8907ffc
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/raster/quantization.cpp
View File

@ -78,7 +78,8 @@ Palette* quantization::create_palette_from_rgb(const Sprite* sprite)
Image* quantization::convert_imgtype(const Image* image, int imgtype,
DitheringMethod ditheringMethod,
const RgbMap* rgbmap,
const Palette* palette)
const Palette* palette,
bool has_background_layer)
{
ase_uint32* rgb_address;
ase_uint16* gray_address;
@ -109,6 +110,7 @@ Image* quantization::convert_imgtype(const Image* image, int imgtype,
rgb_address = (ase_uint32*)image->dat;
switch (new_image->imgtype) {
// RGB -> Grayscale
case IMAGE_GRAYSCALE:
gray_address = (ase_uint16*)new_image->dat;
@ -124,6 +126,7 @@ Image* quantization::convert_imgtype(const Image* image, int imgtype,
gray_address++;
}
break;
// RGB -> Indexed
case IMAGE_INDEXED:
idx_address = new_image->dat;
@ -147,6 +150,7 @@ Image* quantization::convert_imgtype(const Image* image, int imgtype,
gray_address = (ase_uint16*)image->dat;
switch (new_image->imgtype) {
// Grayscale -> RGB
case IMAGE_RGB:
rgb_address = (ase_uint32*)new_image->dat;
@ -158,6 +162,7 @@ Image* quantization::convert_imgtype(const Image* image, int imgtype,
rgb_address++;
}
break;
// Grayscale -> Indexed
case IMAGE_INDEXED:
idx_address = new_image->dat;
@ -178,12 +183,14 @@ Image* quantization::convert_imgtype(const Image* image, int imgtype,
idx_address = image->dat;
switch (new_image->imgtype) {
// Indexed -> RGB
case IMAGE_RGB:
rgb_address = (ase_uint32*)new_image->dat;
for (i=0; i<size; i++) {
c = *idx_address;
if (c == 0)
if (c == 0 && !has_background_layer)
*rgb_address = 0;
else
*rgb_address = _rgba(_rgba_getr(palette->getEntry(c)),
@ -193,12 +200,14 @@ Image* quantization::convert_imgtype(const Image* image, int imgtype,
rgb_address++;
}
break;
// Indexed -> Grayscale
case IMAGE_GRAYSCALE:
gray_address = (ase_uint16*)new_image->dat;
for (i=0; i<size; i++) {
c = *idx_address;
if (c == 0)
if (c == 0 && !has_background_layer)
*gray_address = 0;
else {
r = _rgba_getr(palette->getEntry(c));
@ -212,6 +221,7 @@ Image* quantization::convert_imgtype(const Image* image, int imgtype,
gray_address++;
}
break;
}
break;
}

3
src/raster/quantization.h
View File

@ -37,7 +37,8 @@ namespace quantization {
Image* convert_imgtype(const Image* image, int imgtype,
DitheringMethod ditheringMethod,
const RgbMap* rgbmap,
const Palette* palette);
const Palette* palette,
bool has_background_layer);
}

3
src/undoable.cpp
View File

@ -212,7 +212,8 @@ void Undoable::setImgType(int new_imgtype, DitheringMethod dithering_method)
new_image = quantization::convert_imgtype(old_image, new_imgtype, dithering_method, rgbmap,
// TODO check this out
m_sprite->getCurrentPalette());
m_sprite->getCurrentPalette(),
m_sprite->getBackgroundLayer() != NULL);
if (!new_image)
return; /* TODO error handling: not enough memory!
we should undo all work done */

3
src/util/clipboard.cpp
View File

@ -244,7 +244,8 @@ void clipboard::paste(SpriteWriter& sprite)
else {
RgbMap* rgbmap = sprite->getRgbMap();
src_image = quantization::convert_imgtype(clipboard_image, sprite->getImgType(), DITHERING_NONE,
rgbmap, sprite->getPalette(sprite->getCurrentFrame()));
rgbmap, sprite->getPalette(sprite->getCurrentFrame()),
false);
}
// Do the interactive-transform loop (where the user can move the floating image)