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

Fix problem copying background cels in indexed images

Browse Source 
Now index 0 is persisted in the copy.
This commit is contained in:
David Capello 2015-03-16 18:04:57 -03:00
parent 0350ac4bbe
commit 827eddd459
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/render/render.cpp
View File

@ -1,5 +1,5 @@
// Aseprite Render Library
// Copyright (c) 2001-2014 David Capello
// Copyright (c) 2001-2015 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@ -18,8 +18,7 @@ namespace render {
// Scaled composite
template<class DstTraits, class SrcTraits>
class BlenderHelper
{
class BlenderHelper {
BLEND_COLOR m_blend_color;
color_t m_mask_color;
public:
@ -41,8 +40,7 @@ public:
};
template<>
class BlenderHelper<RgbTraits, GrayscaleTraits>
{
class BlenderHelper<RgbTraits, GrayscaleTraits> {
BLEND_COLOR m_blend_color;
color_t m_mask_color;
public:
@ -66,8 +64,7 @@ public:
};
template<>
class BlenderHelper<RgbTraits, IndexedTraits>
{
class BlenderHelper<RgbTraits, IndexedTraits> {
const Palette* m_pal;
int m_blend_mode;
color_t m_mask_color;
@ -96,6 +93,33 @@ public:
}
};
template<>
class BlenderHelper<IndexedTraits, IndexedTraits> {
int m_blend_mode;
color_t m_mask_color;
public:
BlenderHelper(const Image* src, const Palette* pal, int blend_mode)
{
m_blend_mode = blend_mode;
m_mask_color = src->maskColor();
}
inline void operator()(IndexedTraits::pixel_t& scanline,
const IndexedTraits::pixel_t& dst,
const IndexedTraits::pixel_t& src,
int opacity)
{
if (m_blend_mode == BLEND_MODE_COPY) {
scanline = src;
}
else {
if (src != m_mask_color)
scanline = src;
else
scanline = dst;
}
}
};
template<class DstTraits, class SrcTraits>
static void compose_scaled_image_scale_up(
Image* dst, const Image* src, const Palette* pal,