mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-29 18:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid div by zero by preventing returning a grid bounds with zero width or height (fix #4146)

Browse Source
This commit is contained in:
Martín Capello 2023-12-18 11:43:19 -03:00 committed by David Capello
parent d3562b140c
commit 3f00b3e593
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/site.cpp
View File

@ -98,25 +98,29 @@ Grid Site::grid() const
gfx::Rect Site::gridBounds() const gfx::Rect Site::gridBounds() const
{ {
gfx::Rect bounds;
if (m_layer && m_layer->isTilemap()) { if (m_layer && m_layer->isTilemap()) {
const Grid& grid = static_cast<LayerTilemap*>(m_layer)->tileset()->grid(); const Grid& grid = static_cast<LayerTilemap*>(m_layer)->tileset()->grid();
gfx::Point offset = grid.tileOffset(); gfx::Point offset = grid.tileOffset();
if (const Cel* cel = m_layer->cel(m_frame)) if (const Cel* cel = m_layer->cel(m_frame))
offset += cel->bounds().origin(); offset += cel->bounds().origin();
return gfx::Rect(offset, grid.tileSize()); bounds = gfx::Rect(offset, grid.tileSize());
if (!bounds.isEmpty())
return bounds;
}
else {
if (m_sprite) {
bounds = m_sprite->gridBounds();
if (!bounds.isEmpty())
return bounds;
}
if (ui::is_ui_thread()) {
bounds = Preferences::instance().document(m_document).grid.bounds();
if (!bounds.isEmpty())
return bounds;
}
} }
gfx::Rect bounds;
if (m_sprite) {
bounds = m_sprite->gridBounds();
if (!bounds.isEmpty())
return bounds;
}
if (ui::is_ui_thread()) {
bounds = Preferences::instance().document(m_document).grid.bounds();
if (!bounds.isEmpty())
return bounds;
}
return doc::Sprite::DefaultGridBounds(); return doc::Sprite::DefaultGridBounds();
} }