From ff94116378ae934174caed5858b9b9a98b7822c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Poizl?= <nou.spiro@gmail.com>
Date: Tue, 27 Oct 2020 15:55:57 +0100
Subject: [PATCH] Fix opening FITS files where path contain non Latin1
 characters

---
 kstars/fitsviewer/fitsdata.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
index f4f61ed..a652c1c 100644
--- a/kstars/fitsviewer/fitsdata.cpp
+++ b/kstars/fitsviewer/fitsdata.cpp
@@ -212,7 +212,7 @@ bool FITSData::loadFITSImage(const QByteArray &buffer, const QString &extension,
                                        QRegularExpression("[-{}]")));
         fpstate	fpvar;
         fp_init (&fpvar);
-        if (fp_unpack(m_Filename.toLatin1().data(), uncompressedFile.toLatin1().data(), fpvar) < 0)
+        if (fp_unpack(m_Filename.toLocal8Bit().data(), uncompressedFile.toLatin1().data(), fpvar) < 0)
         {
             errMessage = i18n("Failed to unpack compressed fits");
             if (!silent)
@@ -234,7 +234,7 @@ bool FITSData::loadFITSImage(const QByteArray &buffer, const QString &extension,
     {
         // Use open diskfile as it does not use extended file names which has problems opening
         // files with [ ] or ( ) in their names.
-        if (fits_open_diskfile(&fptr, m_Filename.toLatin1(), READONLY, &status))
+        if (fits_open_diskfile(&fptr, m_Filename.toLocal8Bit(), READONLY, &status))
         {
             return fitsOpenError(status, i18n("Error opening fits file %1", m_Filename), silent);
         }
@@ -246,7 +246,7 @@ bool FITSData::loadFITSImage(const QByteArray &buffer, const QString &extension,
         // Read the FITS file from a memory buffer.
         void *temp_buffer = const_cast<void *>(reinterpret_cast<const void *>(buffer.data()));
         size_t temp_size = buffer.size();
-        if (fits_open_memfile(&fptr, m_Filename.toLatin1().data(), READONLY,
+        if (fits_open_memfile(&fptr, m_Filename.toLocal8Bit().data(), READONLY,
                               &temp_buffer, &temp_size, 0, nullptr, &status))
             return fitsOpenError(status, i18n("Error reading fits buffer."), silent);
 
@@ -401,7 +401,7 @@ bool FITSData::loadCanonicalImage(const QByteArray &buffer, const QString &exten
     }
     else
     {
-        if(!imageFromFile.load(m_Filename.toLatin1()))
+        if(!imageFromFile.load(m_Filename.toLocal8Bit()))
         {
             qCCritical(KSTARS_FITS) << "Failed to open image.";
             return false;
@@ -515,7 +515,7 @@ bool FITSData::loadRAWImage(const QByteArray &buffer, const QString &extension,
     if (buffer.isEmpty())
     {
         // Open file
-        if ((ret = RawProcessor.open_file(m_Filename.toLatin1().constData())) != LIBRAW_SUCCESS)
+        if ((ret = RawProcessor.open_file(m_Filename.toLocal8Bit().constData())) != LIBRAW_SUCCESS)
         {
             lastError = i18n("Cannot open file %1: %2", m_Filename, libraw_strerror(ret));
             RawProcessor.recycle();
@@ -742,7 +742,7 @@ bool FITSData::saveImage(const QString &newFilename)
 
         // Use open diskfile as it does not use extended file names which has problems opening
         // files with [ ] or ( ) in their names.
-        fits_open_diskfile(&fptr, m_Filename.toLatin1(), READONLY, &status);
+        fits_open_diskfile(&fptr, m_Filename.toLocal8Bit(), READONLY, &status);
         fits_movabs_hdu(fptr, 1, IMAGE_HDU, &status);
 
         return true;
@@ -758,7 +758,7 @@ bool FITSData::saveImage(const QString &newFilename)
     }
 
     /* Create a new File, overwriting existing*/
-    if (fits_create_file(&new_fptr, QString("!%1").arg(newFilename).toLatin1(), &status))
+    if (fits_create_file(&new_fptr, QString("!%1").arg(newFilename).toLocal8Bit(), &status))
     {
         fits_report_error(stderr, status);
         return status;
@@ -3449,7 +3449,7 @@ bool FITSData::ImageToFITS(const QString &filename, const QString &format, QStri
     long naxes[3] = { input.width(), input.height(), naxis == 3 ? 3 : 1 };
     char error_status[512] = {0};
 
-    if (fits_create_file(&fptr, QString('!' + output).toLatin1().data(), &status))
+    if (fits_create_file(&fptr, QString('!' + output).toLocal8Bit().data(), &status))
     {
         fits_get_errstatus(status, error_status);
         qCCritical(KSTARS_FITS) << "Failed to create FITS file. Error:" << error_status;
-- 
2.25.1