mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-07 09:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1204 from pseudogames/pixly3

Browse Source 
Fix assert() in pixly encoder/decoder
This commit is contained in:
David Capello 2016-07-22 12:00:37 -03:00 committed by GitHub
commit 2893f98fbd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/file/pixly_format.cpp
View File

@ -173,8 +173,8 @@ bool PixlyFormat::onLoad(FileOp* fop)
for (int y = 0; y < frameHeight; y++) {
// RGB_ALPHA
int y0_down = sheetHeight-1 - y0_up - (frameHeight-1) + y;
uint32_t* src_begin = (uint32_t*)sheet->getPixelAddress(x0 , y0_down);
uint32_t* src_end = (uint32_t*)sheet->getPixelAddress(x0+frameWidth, y0_down);
uint32_t* src_begin = (uint32_t*)sheet->getPixelAddress(x0, y0_down);
uint32_t* src_end = src_begin + frameWidth;
uint32_t* dst_begin = (uint32_t*)image->getPixelAddress(0, y);
std::copy(src_begin, src_end, dst_begin);
@ -328,7 +328,7 @@ bool PixlyFormat::onSave(FileOp* fop)
// RGB_ALPHA
int y0_down = (sheetHeight - 1) - y0 - (frameHeight - 1) + celY + y;
uint32_t* src_begin = (uint32_t*)image->getPixelAddress(0, y);
uint32_t* src_end = (uint32_t*)image->getPixelAddress(celWidth, y);
uint32_t* src_end = src_begin + celWidth;
uint32_t* dst_begin = (uint32_t*)sheet->getPixelAddress(x0 + celX, y0_down);
std::copy(src_begin, src_end, dst_begin);