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

Simplify app_get_color_to_clear_layer() in CLI-mode

Browse Source 
Just use the background color without preprocessing the index color.
This commit is contained in:
David Capello 2024-09-03 19:24:02 -03:00
parent afb8a3d94a
commit 240d481645
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/app.cpp
View File

@ -859,37 +859,8 @@ int app_get_color_to_clear_layer(Layer* layer)
if (layer->isBackground()) { if (layer->isBackground()) {
if (auto* colorBar = ColorBar::instance()) if (auto* colorBar = ColorBar::instance())
color = colorBar->getBgColor(); color = colorBar->getBgColor();
else {
auto c = Preferences::instance().colorBar.bgColor();
if (layer->sprite()->pixelFormat() == IMAGE_INDEXED) {
if (c.getType() == Color::IndexType) {
color =
(c.getIndex() < layer->sprite()->palette(0)->size() ?
c :
app::Color::fromIndex(0));
}
else {
Palette* pal = layer->sprite()->palette(0);
color_t bg;
if (c.getType() == Color::RgbType) {
bg = rgba(c.getRed(), c.getGreen(), c.getBlue(), 255);
bg = pal->findBestfit(rgba_getr(bg),
rgba_getg(bg),
rgba_getb(bg), 255, -1);
}
else {
ASSERT(c.getType() == Color::GrayType);
bg = graya(c.getGray(), 255);
bg = pal->findBestfit(graya_getv(bg),
graya_getv(bg),
graya_getv(bg), 255, -1);
}
color = app::Color::fromIndex(bg);
}
}
else else
color = app::Color::fromRgb(0, 0, 0); color = Preferences::instance().colorBar.bgColor();
}
} }
else { // All transparent layers are cleared with the mask color else { // All transparent layers are cleared with the mask color
color = app::Color::fromMask(); color = app::Color::fromMask();