diff --git a/src/raster/image_impl.h b/src/raster/image_impl.h index 0f6242718..727108ac8 100644 --- a/src/raster/image_impl.h +++ b/src/raster/image_impl.h @@ -234,8 +234,6 @@ void ImageImpl::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::merge(const Image* src, int x, int y, int opacity, int blend_mode) { @@ -300,12 +298,8 @@ void ImageImpl::merge(const Image* src, int x, int y, int opacity dst_address = ((ImageImpl*)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++;