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

Replace SEQUENCE_IMAGE() macro with add_image() lambda in fop_operate()

Browse Source
This commit is contained in:
David Capello 2015-09-28 18:49:34 -03:00
parent 79cd0b258f
commit ee0aae0e3c
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/file/file.cpp
View File

@ -495,33 +495,29 @@ void fop_operate(FileOp *fop, IFileOpProgress* progress)
fop->format->support(FILE_SUPPORT_LOAD)) {
// Load a sequence
if (fop->is_sequence()) {
Image* old_image;
bool loadres;
// Default palette
fop->seq.palette->makeBlack();
// TODO set_palette for each frame???
#define SEQUENCE_IMAGE() \
do { \
fop->seq.last_cel->data()->setImage(fop->seq.image); \
fop->seq.layer->addCel(fop->seq.last_cel); \
\
if (fop->document->sprite()->palette(frame) \
->countDiff(fop->seq.palette, NULL, NULL) > 0) { \
fop->seq.palette->setFrame(frame); \
fop->document->sprite()->setPalette(fop->seq.palette, true); \
} \
\
old_image = fop->seq.image.get(); \
fop->seq.image.reset(NULL); \
fop->seq.last_cel = NULL; \
} while (0)
// Load the sequence
frame_t frames(fop->seq.filename_list.size());
frame_t frame(0);
old_image = nullptr;
Image* old_image = nullptr;
// TODO set_palette for each frame???
auto add_image = [&]() {
fop->seq.last_cel->data()->setImage(fop->seq.image);
fop->seq.layer->addCel(fop->seq.last_cel);
if (fop->document->sprite()->palette(frame)
->countDiff(fop->seq.palette, NULL, NULL) > 0) {
fop->seq.palette->setFrame(frame);
fop->document->sprite()->setPalette(fop->seq.palette, true);
}
old_image = fop->seq.image.get();
fop->seq.image.reset(NULL);
fop->seq.last_cel = NULL;
};
fop->seq.has_alpha = false;
fop->seq.progress_offset = 0.0f;
@ -533,7 +529,7 @@ void fop_operate(FileOp *fop, IFileOpProgress* progress)
fop->filename = it->c_str();
// Call the "load" procedure to read the first bitmap.
loadres = fop->format->load(fop);
bool loadres = fop->format->load(fop);
if (!loadres) {
fop_error(fop, "Error loading frame %d from file \"%s\"\n",
frame+1, fop->filename.c_str());
@ -552,7 +548,7 @@ void fop_operate(FileOp *fop, IFileOpProgress* progress)
// Read ok
else {
// Add the keyframe
SEQUENCE_IMAGE();
add_image();
}
}
// For other frames
@ -567,7 +563,7 @@ void fop_operate(FileOp *fop, IFileOpProgress* progress)
// Compare the old frame with the new one
#if USE_LINK // TODO this should be configurable through a check-box
if (count_diff_between_images(old_image, fop->seq.image)) {
SEQUENCE_IMAGE();
add_image();
}
// We don't need this image
else {
@ -581,7 +577,7 @@ void fop_operate(FileOp *fop, IFileOpProgress* progress)
fop->seq.last_cel = NULL;
}
#else
SEQUENCE_IMAGE();
add_image();
#endif
}