From a9783f60305ce078c0dd5291cb8929092d7285d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Thu, 9 Mar 2023 18:35:38 +0100 Subject: [PATCH] Update LibXISF --- imageinfo.cpp | 12 ++++++------ libXISF | 2 +- loadrunable.cpp | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/imageinfo.cpp b/imageinfo.cpp index 9551b5f..3b34af9 100644 --- a/imageinfo.cpp +++ b/imageinfo.cpp @@ -20,10 +20,10 @@ FITSRecord::FITSRecord(const QByteArray &key, const QVariant &value, const QByte FITSRecord::FITSRecord(const LibXISF::FITSKeyword &record) { - key = record.name.toUtf8(); - comment = record.comment.toUtf8(); + key = record.name.c_str(); + comment = record.comment.c_str(); - QString string = record.value; + QString string = record.value.c_str(); if(string.startsWith('\'') && string.endsWith('\'')) { string.chop(1); @@ -45,9 +45,9 @@ FITSRecord::FITSRecord(const LibXISF::FITSKeyword &record) FITSRecord::FITSRecord(const LibXISF::Property &property) { - key = property.id.toUtf8(); - value = property.value; - comment = property.comment.toUtf8(); + key = property.id.c_str(); + value = QString::fromStdString(property.value.toString()); + comment = property.comment.c_str(); } QByteArray FITSRecord::valueToByteArray() const diff --git a/libXISF b/libXISF index 2107d68..e1fe893 160000 --- a/libXISF +++ b/libXISF @@ -1 +1 @@ -Subproject commit 2107d68e7137ed52a13fb8cdc70306213aff6db2 +Subproject commit e1fe893e2ab9f8803e849b4e30ea1358cd9aad86 diff --git a/loadrunable.cpp b/loadrunable.cpp index d069db8..b19f0ce 100644 --- a/loadrunable.cpp +++ b/loadrunable.cpp @@ -290,7 +290,7 @@ bool loadXISF(const QString &path, ImageInfoData &info, RawImage **image) try { LibXISF::XISFReader xisf; - xisf.open(path); + xisf.open(path.toLocal8Bit().data()); const LibXISF::Image &xisfImage = xisf.getImage(0); @@ -527,7 +527,7 @@ bool readXISFHeader(const QString &path, ImageInfoData &info) try { LibXISF::XISFReader xisf; - xisf.open(path); + xisf.open(path.toLocal8Bit().data()); const LibXISF::Image &image = xisf.getImage(0, false); auto fitskeywords = image.fitsKeywords(); @@ -660,13 +660,13 @@ void ConvertRunable::run() for(auto &record : imageinfo.fitsHeader) { if(record.value.type() == QVariant::Bool) - image.addFITSKeyword({record.key, record.value.toBool() ? "T" : "F", record.comment}); + image.addFITSKeyword({record.key.toStdString(), record.value.toBool() ? "T" : "F", record.comment.toStdString()}); else - image.addFITSKeyword({record.key, record.value.toString(), record.comment}); + image.addFITSKeyword({record.key.toStdString(), record.value.toString().toStdString(), record.comment.toStdString()}); } xisf.writeImage(image); - xisf.save(m_outfile); + xisf.save(m_outfile.toLocal8Bit().data()); } catch(LibXISF::Error &err) {