mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 06:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible bug/crash using a cmd::CopyRegion()

Browse Source 
The region that we save must be exactly the same that we use in the swap
process.
This commit is contained in:
David Capello 2016-02-26 12:50:09 -03:00
parent c1a2cbebde
commit 875e2cd391
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/cmd/copy_region.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -22,7 +22,7 @@ CopyRegion::CopyRegion(Image* dst, Image* src,
const gfx::Region& region, int dst_dx, int dst_dy)
: WithImage(dst)
{
// Save region pixels
// Create region to save/swap later
for (const auto& rc : region) {
gfx::Clip clip(
rc.x+dst_dx, rc.y+dst_dy,
@ -33,12 +33,14 @@ CopyRegion::CopyRegion(Image* dst, Image* src,
continue;
m_region.createUnion(m_region, gfx::Region(clip.dstBounds()));
}
for (int y=0; y<clip.size.h; ++y) {
// Save region pixels
for (const auto& rc : m_region) {
for (int y=0; y<rc.h; ++y)
m_stream.write(
(const char*)src->getPixelAddress(clip.src.x, clip.src.y+y),
src->getRowStrideSize(clip.size.w));
}
(const char*)src->getPixelAddress(rc.x, rc.y+y),
src->getRowStrideSize(rc.w));
}
}