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

Fix blur ink: avoid adding dark pixels when opacity < 255 (fix #708)

Browse Source
This commit is contained in:
David Capello 2016-05-03 17:00:50 -03:00
parent 5b2c162a6d
commit 065ad4f1dc
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,13 +365,10 @@ public:
m_area.b /= m_area.count;
m_area.a /= 9;
RgbTraits::pixel_t c = *m_srcAddress;
m_area.r = rgba_getr(c) + (m_area.r-rgba_getr(c)) * m_opacity / 255;
m_area.g = rgba_getg(c) + (m_area.g-rgba_getg(c)) * m_opacity / 255;
m_area.b = rgba_getb(c) + (m_area.b-rgba_getb(c)) * m_opacity / 255;
m_area.a = rgba_geta(c) + (m_area.a-rgba_geta(c)) * 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 {
*m_dstAddress = *m_srcAddress;
@ -419,11 +416,10 @@ public:
m_area.v /= m_area.count;
m_area.a /= 9;
GrayscaleTraits::pixel_t c = *m_srcAddress;
m_area.v = graya_getv(c) + (m_area.v-graya_getv(c)) * m_opacity / 255;
m_area.a = graya_geta(c) + (m_area.a-graya_geta(c)) * 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 {
*m_dstAddress = *m_srcAddress;
@ -475,13 +471,13 @@ public:
m_area.b /= m_area.count;
m_area.a /= 9;
uint32_t color32 = m_palette->getEntry(*m_srcAddress);
m_area.r = rgba_getr(color32) + (m_area.r-rgba_getr(color32)) * m_opacity / 255;
m_area.g = rgba_getg(color32) + (m_area.g-rgba_getg(color32)) * m_opacity / 255;
m_area.b = rgba_getb(color32) + (m_area.b-rgba_getb(color32)) * m_opacity / 255;
m_area.a = rgba_geta(color32) + (m_area.a-rgba_geta(color32)) * 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_area.r, m_area.g, m_area.b, m_area.a);
*m_dstAddress = m_rgbmap->mapColor(
rgba_getr(c), rgba_getg(c), rgba_getb(c), rgba_geta(c));
}
else {
*m_dstAddress = *m_srcAddress;