Usable OpenGL ES

loadrunable.cpp

@@ -13,7 +13,6 @@
 #include <libxisf.h>
 #include "rawimage.h"
 #include "starfit.h"
-#include "wcslib/wcshdr.h"
 
 #ifdef COLOR_MANAGMENT
 #include <QColorSpace>
@@ -270,9 +269,6 @@ bool loadFITS(const QString path, ImageInfoData &info, std::shared_ptr<RawImage>
             else
                 image = RawImage::fromPlanar(img);
 
-            if(image)
-                image->convertToGLFormat();
-
             break;
         }
     }
@@ -343,16 +339,14 @@ bool loadXISF(const QString &path, ImageInfoData &info, std::shared_ptr<RawImage
         {
             image = std::make_shared<RawImage>(tmpImage.width(), tmpImage.height(), 1, type);
             std::memcpy(image->data(), tmpImage.imageData(), tmpImage.imageDataSize() / tmpImage.channelCount());
+            return true;
         }
         else if(tmpImage.channelCount() == 3 || tmpImage.channelCount() == 4)
         {
             image = RawImage::fromPlanar(tmpImage.imageData(), tmpImage.width(), tmpImage.height(), tmpImage.channelCount(), type);
-        }
-        if(image)
-        {
-            image->convertToGLFormat();
             return true;
         }
+        return false;
     }
     catch (LibXISF::Error &err)
     {
@@ -381,8 +375,10 @@ void LoadRunable::run()
         if(!loadImage(m_file, info, rawImage))
             info.info.append({QObject::tr("Error"), QObject::tr("Failed to load image")});
 
+
         if(rawImage && !m_thumbnail)
         {
+            rawImage->convertToGLFormat();
             timer.start();
             rawImage->calcStats();
             const RawImage::Stats &stats = rawImage->imageStats();
@@ -418,6 +414,7 @@ void LoadRunable::run()
                 if(QUALITY_RESIZE)
                     rawImage->resize(THUMB_SIZE, THUMB_SIZE);
 
+                rawImage->convertToGLFormat();
                 rawImage->convertToThumbnail();
             }
             QMetaObject::invokeMethod(m_receiver, "thumbnailLoadFinish", Qt::QueuedConnection, Q_ARG(std::shared_ptr<RawImage>, rawImage));