atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Read tiles image data from buffer, rather than auto-detecting format from file extension

Browse source
This commit is contained in:
Marcus Huderle 2019-01-07 09:31:48 -06:00
parent fa61663465
commit d58918a554
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ui/tileseteditor.cpp
View file

@ -7,6 +7,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QCloseEvent> #include <QCloseEvent>
#include <QImageReader>
TilesetEditor::TilesetEditor(Project *project, QString primaryTilesetLabel, QString secondaryTilesetLabel, QWidget *parent) : TilesetEditor::TilesetEditor(Project *project, QString primaryTilesetLabel, QString secondaryTilesetLabel, QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
@ -346,8 +347,16 @@ void TilesetEditor::importTilesetTiles(Tileset *tileset, bool primary) {
logInfo(QString("Importing %1 tileset tiles '%2'").arg(descriptor).arg(filepath)); logInfo(QString("Importing %1 tileset tiles '%2'").arg(descriptor).arg(filepath));
// Validate image dimensions. // Read image data from buffer so that the built-in QImage doesn't try to detect file format
QImage image = QImage(filepath); // purely from the extension name. Advance Map exports ".png" files that are actually BMP format, for example.
QFile file(filepath);
QImage image;
if (file.open(QIODevice::ReadOnly)) {
QByteArray imageData = file.readAll();
image = QImage::fromData(imageData);
} else {
logError(QString("Failed to open image file: '%1'").arg(filepath));
}
if (image.width() == 0 || image.height() == 0 || image.width() % 8 != 0 || image.height() % 8 != 0) { if (image.width() == 0 || image.height() == 0 || image.width() % 8 != 0 || image.height() % 8 != 0) {
QMessageBox msgBox(this); QMessageBox msgBox(this);
msgBox.setText("Failed to import tiles."); msgBox.setText("Failed to import tiles.");