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

Use doc::rgba() to avoid confusion with gfx::rgba()

Browse Source 
I was testing the Clang modules feature, and this is necessary if we
enable modules because it looks like "gfx/color.h" is included in some
way from this file too.
This commit is contained in:
David Capello 2019-11-25 11:41:59 -03:00
parent 2d79834b1f
commit c06fbdf346
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ private:
template<> template<>
void LockAlphaInkProcessing<RgbTraits>::processPixel(int x, int y) { void LockAlphaInkProcessing<RgbTraits>::processPixel(int x, int y) {
color_t result = rgba_blender_normal(*m_srcAddress, m_color, m_opacity); color_t result = rgba_blender_normal(*m_srcAddress, m_color, m_opacity);
*m_dstAddress = rgba( *m_dstAddress = doc::rgba(
rgba_getr(result), rgba_getr(result),
rgba_getg(result), rgba_getg(result),
rgba_getb(result), rgba_getb(result),
@ -382,7 +382,7 @@ public:
m_area.a /= 9; m_area.a /= 9;
*m_dstAddress = *m_dstAddress =
rgba_blender_merge(*m_srcAddress, rgba_blender_merge(*m_srcAddress,
rgba(m_area.r, m_area.g, m_area.b, m_area.a), doc::rgba(m_area.r, m_area.g, m_area.b, m_area.a),
m_opacity); m_opacity);
} }
else { else {
@ -486,7 +486,7 @@ public:
const color_t c = const color_t c =
rgba_blender_merge(m_palette->getEntry(*m_srcAddress), rgba_blender_merge(m_palette->getEntry(*m_srcAddress),
rgba(m_area.r, m_area.g, m_area.b, m_area.a), doc::rgba(m_area.r, m_area.g, m_area.b, m_area.a),
m_opacity); m_opacity);
*m_dstAddress = m_rgbmap->mapColor( *m_dstAddress = m_rgbmap->mapColor(
@ -1199,7 +1199,7 @@ bool BrushInkProcessingBase<RgbTraits>::preProcessPixel(int x, int y, color_t* r
} }
case IMAGE_GRAYSCALE: { case IMAGE_GRAYSCALE: {
c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y); c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y);
c = rgba(graya_getv(c), graya_getv(c), graya_getv(c), graya_geta(c)); c = doc::rgba(graya_getv(c), graya_getv(c), graya_getv(c), graya_geta(c));
c = rgba_blender_normal(*m_dstAddress, c, m_opacity); c = rgba_blender_normal(*m_dstAddress, c, m_opacity);
break; break;
} }
@ -1363,7 +1363,7 @@ template<>
void BrushLockAlphaInkProcessing<RgbTraits>::processPixel(int x, int y) { void BrushLockAlphaInkProcessing<RgbTraits>::processPixel(int x, int y) {
color_t c; color_t c;
if (preProcessPixel(x, y, &c)) if (preProcessPixel(x, y, &c))
*m_dstAddress = rgba(rgba_getr(c), rgba_getg(c), rgba_getb(c), rgba_geta(*m_srcAddress)); *m_dstAddress = doc::rgba(rgba_getr(c), rgba_getg(c), rgba_getb(c), rgba_geta(*m_srcAddress));
} }
template<> template<>
@ -1407,7 +1407,7 @@ void BrushEraserInkProcessing<RgbTraits>::processPixel(int x, int y) {
case IMAGE_RGB: { case IMAGE_RGB: {
c = get_pixel_fast<RgbTraits>(m_brushImage, x, y); c = get_pixel_fast<RgbTraits>(m_brushImage, x, y);
int t; int t;
c = rgba(rgba_getr(*m_srcAddress), c = doc::rgba(rgba_getr(*m_srcAddress),
rgba_getg(*m_srcAddress), rgba_getg(*m_srcAddress),
rgba_getb(*m_srcAddress), rgba_getb(*m_srcAddress),
MUL_UN8(rgba_geta(*m_dstAddress), 255 - rgba_geta(c), t)); MUL_UN8(rgba_geta(*m_dstAddress), 255 - rgba_geta(c), t));
@ -1426,7 +1426,7 @@ void BrushEraserInkProcessing<RgbTraits>::processPixel(int x, int y) {
// Indexed Sprite. // Indexed Sprite.
c = m_palette->getEntry(c); c = m_palette->getEntry(c);
int t; int t;
c = rgba(rgba_getr(*m_srcAddress), c = doc::rgba(rgba_getr(*m_srcAddress),
rgba_getg(*m_srcAddress), rgba_getg(*m_srcAddress),
rgba_getb(*m_srcAddress), rgba_getb(*m_srcAddress),
MUL_UN8(rgba_geta(*m_dstAddress), 255 - rgba_geta(c), t)); MUL_UN8(rgba_geta(*m_dstAddress), 255 - rgba_geta(c), t));
@ -1435,7 +1435,7 @@ void BrushEraserInkProcessing<RgbTraits>::processPixel(int x, int y) {
case IMAGE_GRAYSCALE: { case IMAGE_GRAYSCALE: {
c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y); c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y);
int t; int t;
c = rgba(rgba_getr(*m_srcAddress), c = doc::rgba(rgba_getr(*m_srcAddress),
rgba_getg(*m_srcAddress), rgba_getg(*m_srcAddress),
rgba_getb(*m_srcAddress), rgba_getb(*m_srcAddress),
MUL_UN8(rgba_geta(*m_dstAddress), 255 - graya_geta(c), t)); MUL_UN8(rgba_geta(*m_dstAddress), 255 - graya_geta(c), t));
@ -1802,7 +1802,7 @@ void BrushCopyInkProcessing<RgbTraits>::processPixel(int x, int y) {
c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y); c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y);
if (graya_geta(c) == 0) if (graya_geta(c) == 0)
return; return;
c = rgba(graya_getv(c), graya_getv(c), graya_getv(c), graya_geta(c)); c = doc::rgba(graya_getv(c), graya_getv(c), graya_getv(c), graya_geta(c));
break; break;
} }
case IMAGE_BITMAP: { case IMAGE_BITMAP: {