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

Fix octree convolution matrix wrong results

Browse Source 
Before this fix, convolution matrix results in mask color pixels.
The function OctreeMap::mapColor was returning mask color of all colors with alpha = 0
This commit is contained in:
Gaspar Capello 2020-04-28 08:48:30 -03:00 committed by David Capello
parent 966daf5e34
commit e7b955a028
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/doc/octree_map.cpp
View File

@ -260,14 +260,12 @@ void OctreeMap::feedWithImage(const Image* image,
int OctreeMap::mapColor(color_t rgba) const int OctreeMap::mapColor(color_t rgba) const
{ {
if (rgba_geta(rgba) == 0 && m_maskColor >= 0) if (m_root.children())
return m_maskColor;
else if (m_root.children())
return m_root.mapColor(rgba_getr(rgba), return m_root.mapColor(rgba_getr(rgba),
rgba_getg(rgba), rgba_getg(rgba),
rgba_getb(rgba), 0); rgba_getb(rgba), 0);
else else
return 0; return -1;
} }
void OctreeMap::regenerateMap(const Palette* palette, const int maskIndex) void OctreeMap::regenerateMap(const Palette* palette, const int maskIndex)
@ -284,17 +282,30 @@ void OctreeMap::regenerateMap(const Palette* palette, const int maskIndex)
m_root = OctreeNode(); m_root = OctreeNode();
m_leavesVector.clear(); m_leavesVector.clear();
for (int i=0; i<palette->size(); i++) m_maskIndex = maskIndex;
int maskColorBestFitIndex;
if (maskIndex < 0) {
m_maskColor = 0x00ffffff;
maskColorBestFitIndex = -1;
}
else {
m_maskColor = palette->getEntry(maskIndex);
maskColorBestFitIndex = palette->findBestfit(rgba_getr(m_maskColor),
rgba_getg(m_maskColor),
rgba_getb(m_maskColor), 255, maskIndex);
}
for (int i=0; i<palette->size(); i++) {
if (i == maskIndex) {
m_root.addColor(palette->entry(i), 0, &m_root, maskColorBestFitIndex, 8);
continue;
}
m_root.addColor(palette->entry(i), 0, &m_root, i, 8); m_root.addColor(palette->entry(i), 0, &m_root, i, 8);
}
m_root.fillOrphansNodes(palette, 0, 0); m_root.fillOrphansNodes(palette, 0, 0);
m_palette = palette; m_palette = palette;
m_modifications = palette->getModifications(); m_modifications = palette->getModifications();
m_maskIndex = maskIndex;
if (maskIndex < 0)
m_maskColor = 0x00ffffff;
else
m_maskColor = palette->getEntry(maskIndex);
} }
} // namespace doc } // namespace doc