Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarImageMetadataDatabase.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2024-09-12 19:13:57 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2024-09-12 19:13:57 +1000
commit4da398e42dbc9b18ec27ba27d0fa570adfc58922 (patch)
tree26b758398ed032eb951152b47ddcfc44206a7e9c /source/game/StarImageMetadataDatabase.cpp
parent3c4a2eb71eea73c7e505ab631a1abc484f9e7b92 (diff)
parent7852ad9cf2efdf359132c986f46b0e34acbd28ba (diff)
Merge branch 'main' into wip/net-n-btree
Diffstat (limited to 'source/game/StarImageMetadataDatabase.cpp')
-rw-r--r--source/game/StarImageMetadataDatabase.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/game/StarImageMetadataDatabase.cpp b/source/game/StarImageMetadataDatabase.cpp
index bf84e51..d04e984 100644
--- a/source/game/StarImageMetadataDatabase.cpp
+++ b/source/game/StarImageMetadataDatabase.cpp
@@ -174,7 +174,11 @@ Vec2U ImageMetadataDatabase::calculateImageSize(AssetPath const& path) const {
imageSize = *size;
} else {
locker.unlock();
- imageSize = get<0>(Image::readPngMetadata(assets->openFile(path.basePath)));
+ auto file = assets->openFile(path.basePath);
+ if (Image::isPng(file))
+ imageSize = get<0>(Image::readPngMetadata(file));
+ else
+ imageSize = fallback();
locker.lock();
m_sizeCache[path.basePath] = imageSize;
}