mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-11 09:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue 337: Vertical flip and Horizontal flips functions affect more than selected area

Browse Source
This commit is contained in:
David Capello 2014-02-17 00:41:28 -03:00
parent 3b8926b7d1
commit 2462767aac
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/commands/cmd_flip.cpp
View File

@ -96,22 +96,20 @@ void FlipCommand::onExecute(Context* context)
// whole image. // whole image.
if (document->isMaskVisible()) { if (document->isMaskVisible()) {
mask = document->getMask(); mask = document->getMask();
gfx::Rect maskBounds = mask->getBounds();
// Adjust the mask depending on the cel position.
maskBounds.offset(-x, -y);
// Intersect the full area of the image with the mask's // Intersect the full area of the image with the mask's
// bounds, so we don't request to flip an area outside the // bounds, so we don't request to flip an area outside the
// image's bounds. // image's bounds.
bounds = bounds.createIntersect(maskBounds); bounds = bounds.createIntersect(gfx::Rect(mask->getBounds()).offset(-x, -y));
// If the mask isn't a rectangular area, we've to flip the mask too. // If the mask isn't a rectangular area, we've to flip the mask too.
if (mask->getBitmap() != NULL && !mask->isRectangular()) { if (mask->getBitmap() != NULL && !mask->isRectangular()) {
int bgcolor = app_get_color_to_clear_layer(writer.layer()); int bgcolor = app_get_color_to_clear_layer(writer.layer());
// Flip the portion of image specified by the mask. // Flip the portion of image specified by the mask.
mask->offsetOrigin(-x, -y);
api.flipImageWithMask(image, mask, m_flipType, bgcolor); api.flipImageWithMask(image, mask, m_flipType, bgcolor);
mask->offsetOrigin(x, y);
alreadyFlipped = true; alreadyFlipped = true;
// Flip the mask. // Flip the mask.
@ -121,8 +119,7 @@ void FlipCommand::onExecute(Context* context)
base::UniquePtr<Mask> newMask(new Mask(*mask)); base::UniquePtr<Mask> newMask(new Mask(*mask));
newMask->freeze(); newMask->freeze();
raster::algorithm::flip_image(newMask->getBitmap(), raster::algorithm::flip_image(newMask->getBitmap(),
maskBitmap->getBounds(), maskBitmap->getBounds(), m_flipType);
m_flipType);
newMask->unfreeze(); newMask->unfreeze();
// Change the current mask and generate the new boundaries. // Change the current mask and generate the new boundaries.

5
src/app/document_api.cpp
View File

@ -990,9 +990,8 @@ void DocumentApi::clearMask(Layer* layer, Cel* cel, int bgcolor)
} }
} }
void DocumentApi::flipImage(Image* image, void DocumentApi::flipImage(Image* image, const gfx::Rect& bounds,
const gfx::Rect& bounds, raster::algorithm::FlipType flipType)
raster::algorithm::FlipType flipType)
{ {
// Insert the undo operation. // Insert the undo operation.
if (undoEnabled()) { if (undoEnabled()) {

22
src/raster/algorithm/flip_image.cpp
View File

@ -50,18 +50,14 @@ void flip_image(Image* image, const gfx::Rect& bounds, FlipType flipType)
break; break;
case FlipVertical: { case FlipVertical: {
int section_size = image->getRowStrideSize(bounds.w);
std::vector<uint8_t> tmpline(section_size);
int v = bounds.y+bounds.h-1; int v = bounds.y+bounds.h-1;
for (int y=bounds.y; y<bounds.y+bounds.h/2; ++y, --v) { for (int y=bounds.y; y<bounds.y+bounds.h/2; ++y, --v) {
uint8_t* address1 = image->getPixelAddress(bounds.x, y); for (int x=bounds.x; x<bounds.x+bounds.w; ++x) {
uint8_t* address2 = image->getPixelAddress(bounds.x, v); uint32_t c1 = get_pixel(image, x, y);
uint32_t c2 = get_pixel(image, x, v);
// Swap lines. put_pixel(image, x, y, c2);
std::copy(address1, address1+section_size, tmpline.begin()); put_pixel(image, x, v, c1);
std::copy(address2, address2+section_size, address1); }
std::copy(tmpline.begin(), tmpline.end(), address2);
} }
break; break;
} }
@ -75,7 +71,7 @@ void flip_image_with_mask(Image* image, const Mask* mask, FlipType flipType, int
switch (flipType) { switch (flipType) {
case FlipHorizontal: { case FlipHorizontal: {
base::UniquePtr<Image> originalRow(Image::create(image->getPixelFormat(), mask->getBounds().w, 1)); base::UniquePtr<Image> originalRow(Image::create(image->getPixelFormat(), bounds.w, 1));
for (int y=bounds.y; y<bounds.y+bounds.h; ++y) { for (int y=bounds.y; y<bounds.y+bounds.h; ++y) {
// Copy the current row. // Copy the current row.
@ -93,8 +89,8 @@ void flip_image_with_mask(Image* image, const Mask* mask, FlipType flipType, int
break; break;
} }
case FlipVertical:{ case FlipVertical: {
base::UniquePtr<Image> originalCol(Image::create(image->getPixelFormat(), 1, mask->getBounds().h)); base::UniquePtr<Image> originalCol(Image::create(image->getPixelFormat(), 1, bounds.h));
for (int x=bounds.x; x<bounds.x+bounds.w; ++x) { for (int x=bounds.x; x<bounds.x+bounds.w; ++x) {
// Copy the current column. // Copy the current column.