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 ase_parallelogram_map_standard for RGB/Grayscale for mask with alpha=0

Browse Source 
If the transparent/mask color has alpha = 0, we cannot filter by
RGB/Grayscale values, we have to blend all colors anyway. Only when
the mask has alpha > 0 we can check if the RGB values are different to
the mask RGB values. In other words, comparing the source color with the
mask, makes sense only when the mask has alpha > 0.
This commit is contained in:
David Capello 2014-06-14 21:30:01 -03:00
parent 9ac51fd0be
commit 12b30248bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/raster/rotate.cpp
View File

@ -190,14 +190,14 @@ class RgbDelegate : public GenericDelegate<RgbTraits> {
public:
RgbDelegate(color_t mask_color) {
m_blender = rgba_blenders[BLEND_MODE_NORMAL];
m_mask_color = mask_color & rgba_rgb_mask;
m_mask_color = mask_color;
}
void feedLine(Image* spr, int spr_x, int spr_y) {
ASSERT(m_it != m_end);
register int c = spr->getPixel(spr_x, spr_y);
if ((c & rgba_rgb_mask) != m_mask_color)
if ((rgba_geta(m_mask_color) == 0) || ((c & rgba_rgb_mask) != (m_mask_color & rgba_rgb_mask)))
*m_it = m_blender(*m_it, c, 255);
++m_it;
@ -212,14 +212,14 @@ class GrayscaleDelegate : public GenericDelegate<GrayscaleTraits> {
public:
GrayscaleDelegate(color_t mask_color) {
m_blender = graya_blenders[BLEND_MODE_NORMAL];
m_mask_color = mask_color & graya_v_mask;
m_mask_color = mask_color;
}
void feedLine(Image* spr, int spr_x, int spr_y) {
ASSERT(m_it != m_end);
register int c = spr->getPixel(spr_x, spr_y);
if ((c & graya_v_mask) != m_mask_color)
if ((graya_geta(m_mask_color) == 0) || ((c & graya_v_mask) != (m_mask_color & graya_v_mask)))
*m_it = m_blender(*m_it, c, 255);
++m_it;