mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-05 06:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed usage of color_map in ImageImpl<IndexedTraits>::merge() function.

Browse Source
This commit is contained in:
David Capello 2010-07-16 18:21:05 -03:00
parent ba1c80831b
commit 65d1ab6865
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/raster/image_impl.h
View File

@ -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++;