mirror of
https://github.com/aseprite/aseprite.git
synced 2025-01-05 21:57:20 +00:00
Removed usage of color_map in ImageImpl<IndexedTraits>::merge() function.
This commit is contained in:
parent
ba1c80831b
commit
65d1ab6865
@ -234,8 +234,6 @@ void ImageImpl<IndexedTraits>::clear(int color)
|
||||
memset(raw_pixels(), color, w*h);
|
||||
}
|
||||
|
||||
/* if "color_map" is not NULL, it's used by the routine to merge the
|
||||
source and the destionation pixels */
|
||||
template<>
|
||||
void ImageImpl<IndexedTraits>::merge(const Image* src, int x, int y, int opacity, int blend_mode)
|
||||
{
|
||||
@ -300,12 +298,8 @@ void ImageImpl<IndexedTraits>::merge(const Image* src, int x, int y, int opacity
|
||||
dst_address = ((ImageImpl<IndexedTraits>*)dst)->line_address(ydst)+xbeg;
|
||||
|
||||
for (xdst=xbeg; xdst<=xend; xdst++) {
|
||||
if (*src_address != mask_color) {
|
||||
if (color_map)
|
||||
*dst_address = color_map->data[*src_address][*dst_address];
|
||||
else
|
||||
*dst_address = (*src_address);
|
||||
}
|
||||
if (*src_address != mask_color)
|
||||
*dst_address = (*src_address);
|
||||
|
||||
dst_address++;
|
||||
src_address++;
|
||||
|
Loading…
Reference in New Issue
Block a user