mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-04 08:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hidden colors should be discarded (fix #3505)

Browse Source 
Before this fix, hidden pixels (alpha == 0 and non-zero RGB values) were added to the octree map.
This commit is contained in:
Gaspar Capello 2022-09-07 10:34:06 -03:00 committed by David Capello
parent eced4734aa
commit aa41b742bd
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/doc/octree_map.cpp
View File

@ -232,22 +232,20 @@ void OctreeMap::feedWithImage(const Image* image,
ASSERT(image);
ASSERT(image->pixelFormat() == IMAGE_RGB || image->pixelFormat() == IMAGE_GRAYSCALE);
color_t forceFullOpacity;
color_t alpha = 0;
int alpha = 0;
const bool imageIsRGBA = image->pixelFormat() == IMAGE_RGB;
auto add_color_to_octree =
[this, &forceFullOpacity, &maskColor, &alpha, &levelDeep, &imageIsRGBA](color_t color) {
if (color != maskColor) {
[this, &forceFullOpacity, &alpha, &levelDeep, &imageIsRGBA](color_t color) {
alpha = (imageIsRGBA ? rgba_geta(color) : graya_geta(color));
if (alpha >= MIN_ALPHA_THRESHOLD) { // Colors which alpha is less than
// MIN_ALPHA_THRESHOLD will not registered
color |= forceFullOpacity;
alpha = (imageIsRGBA ? rgba_geta(color) : graya_geta(color));
if (alpha >= MIN_ALPHA_THRESHOLD) { // Colors which alpha is less than
// MIN_ALPHA_THRESHOLD will not registered
color = (imageIsRGBA ? color : rgba(graya_getv(color),
graya_getv(color),
graya_getv(color),
graya_geta(color)));
addColor(color, levelDeep);
}
color = (imageIsRGBA ? color : rgba(graya_getv(color),
graya_getv(color),
graya_getv(color),
alpha));
addColor(color, levelDeep);
}
};