root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2024-10-06 06:53:21 +02:00
Code Issues Projects Releases Wiki Activity

Improved error handling

Browse Source
This commit is contained in:
Martin Tůma 2018-11-26 22:37:16 +01:00
parent 6f5bedb82b
commit ccfcc370d6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sprites.cpp
View File

@ -61,9 +61,13 @@ bool Sprites::load(const QString &jsonFile, const QString &imageFile)
for (QJsonObject::const_iterator it = json.constBegin();
it != json.constEnd(); it++) {
QJsonValue val(*it);
if (val.isObject())
_sprites.insert(it.key(), Sprite(val.toObject()));
else
if (val.isObject()) {
Sprite s(val.toObject());
if (s.rect().isValid())
_sprites.insert(it.key(), s);
else
qWarning() << it.key() << ": invalid sprite definition";
} else
qWarning() << it.key() << ": invalid sprite definition";
}
@ -82,10 +86,8 @@ QImage Sprites::icon(const QString &name) const
if (it == _sprites.constEnd())
return QImage();
if (!img.rect().contains(it->rect())) {
qWarning() << it->rect() << ": invalid sprite rect";
if (!img.rect().contains(it->rect()))
return QImage();
}
return img.copy(it->rect());
}