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

Avoid making the color darker with Blur tool when alpha < 255 (fix #708)

Browse Source 
Related to 065ad4f1dca9404e8f66c6a6224dad918e57807c
This commit is contained in:
David Capello 2019-05-31 18:36:09 -03:00
parent 8aaf679406
commit f3731c9c28
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/tools/ink_processing.h
View File

@ -378,12 +378,8 @@ public:
m_area.r /= m_area.count; m_area.r /= m_area.count;
m_area.g /= m_area.count; m_area.g /= m_area.count;
m_area.b /= m_area.count; m_area.b /= m_area.count;
m_area.a /= 9; m_area.a = (m_area.a/9) * m_opacity / 255;
*m_dstAddress = rgba(m_area.r, m_area.g, m_area.b, m_area.a);
*m_dstAddress =
rgba_blender_normal(*m_srcAddress,
rgba(m_area.r, m_area.g, m_area.b, m_area.a),
m_opacity);
} }
else { else {
*m_dstAddress = *m_srcAddress; *m_dstAddress = *m_srcAddress;
@ -396,8 +392,7 @@ private:
void reset() { count = r = g = b = a = 0; } void reset() { count = r = g = b = a = 0; }
void operator()(RgbTraits::pixel_t color) void operator()(RgbTraits::pixel_t color) {
{
if (rgba_geta(color) != 0) { if (rgba_geta(color) != 0) {
r += rgba_getr(color); r += rgba_getr(color);
g += rgba_getg(color); g += rgba_getg(color);
@ -429,12 +424,8 @@ public:
if (m_area.count > 0) { if (m_area.count > 0) {
m_area.v /= m_area.count; m_area.v /= m_area.count;
m_area.a /= 9; m_area.a = (m_area.a/9) * m_opacity / 255;
*m_dstAddress = graya(m_area.v, m_area.a);
*m_dstAddress =
graya_blender_normal(*m_srcAddress,
graya(m_area.v, m_area.a),
m_opacity);
} }
else { else {
*m_dstAddress = *m_srcAddress; *m_dstAddress = *m_srcAddress;
@ -484,15 +475,9 @@ public:
m_area.r /= m_area.count; m_area.r /= m_area.count;
m_area.g /= m_area.count; m_area.g /= m_area.count;
m_area.b /= m_area.count; m_area.b /= m_area.count;
m_area.a /= 9; m_area.a = (m_area.a/9) * m_opacity / 255;
color_t c =
rgba_blender_normal(m_palette->getEntry(*m_srcAddress),
rgba(m_area.r, m_area.g, m_area.b, m_area.a),
m_opacity);
*m_dstAddress = m_rgbmap->mapColor( *m_dstAddress = m_rgbmap->mapColor(
rgba_getr(c), rgba_getg(c), rgba_getb(c), rgba_geta(c)); m_area.r, m_area.g, m_area.b, m_area.a);
} }
else { else {
*m_dstAddress = *m_srcAddress; *m_dstAddress = *m_srcAddress;