XISF support

.vscode/c_cpp_properties.json

@@ -3,6 +3,7 @@
     {
       "name": "Linux",
       "includePath": [
+        "${env:PCLINCDIR}",
         "${workspaceFolder}/gui/include",
         "${workspaceFolder}/image/raster/include",
         "${workspaceFolder}/image/fits/include",

fits-army-knife.pro

@@ -29,6 +29,8 @@ SOURCES += \
     image/fits/src/fitsexception.cpp \
     image/fits/src/fitsimage.cpp \
     image/fits/src/fitstantrum.cpp \
+    image/xisf/src/xisfexception.cpp \
+    image/xisf/src/xisfimage.cpp \
     image/raster/src/imageloadexception.cpp \
     image/raster/src/image.cpp \
     image/raster/src/pixelvisitortypemismatch.cpp \
@@ -46,6 +48,8 @@ HEADERS += \
     image/fits/include/fitstantrum.h \
     image/fits/include/fitsimage.h \
     $$PCL_INCLUDE_DIR/pcl/XISF.h \
+    image/xisf/include/xisfexception.h \
+    image/xisf/include/xisfimage.h \
     image/raster/include/imageloadexception.h \
     image/raster/include/image.h \
     image/raster/include/rastertypes.h \

image/fits/include/fitsimage.h

@@ -1,10 +1,11 @@
 #pragma once
 
+#include <fitsio.h>
+#include <inttypes.h>
+
 #include "image.h"
 #include "pixelvisitor.h"
 #include "rastertypes.h"
-#include <fitsio.h>
-#include <inttypes.h>
 
 namespace ELS
 {
@@ -33,7 +34,6 @@ namespace ELS
                   bool isColor,
                   int width,
                   int height,
-                  int64_t pixelCount,
                   void* pixels);
 
         template <typename PixelT>
@@ -51,7 +51,6 @@ namespace ELS
         bool _isColor;
         int _width;
         int _height;
-        int64_t _pixelCount;
         void* _pixels;
     };
 

image/fits/src/fitsimage.cpp

@@ -123,7 +123,6 @@ namespace ELS
                              isColor,
                              width,
                              height,
-                             pixelCount,
                              pixels);
     }
 
@@ -132,14 +131,12 @@ namespace ELS
                          bool isColor,
                          int width,
                          int height,
-                         int64_t pixelCount,
                          void* pixels)
         : _sampleFormat(sampleFormat),
           _format(format),
           _isColor(isColor),
           _width(width),
           _height(height),
-          _pixelCount(pixelCount),
           _pixels(pixels)
     {
     }

image/raster/src/image.cpp

@@ -5,6 +5,7 @@
 #include "imageloadexception.h"
 #include "image.h"
 #include "fitsimage.h"
+#include "xisfimage.h"
 
 namespace ELS
 {
@@ -46,7 +47,7 @@ namespace ELS
         case FT_FITS:
             return FITSImage::load(filename);
         case FT_XISF:
-            throw new ImageLoadException("XISF support not quite here yet!");
+            return XISFImage::load(filename);
         case FT_UNKNOWN:
         default:
             throw new ImageLoadException("Could not determine image type from filename extension");
@@ -68,9 +69,9 @@ namespace ELS
             }
             break;
         case FT_XISF:
-            if (error != 0)
+            if (checkMagic(filename, &g_xisfMagic, error))
             {
-                sprintf(error, "XISF support coming soon!");
+                return FT_XISF;
             }
             break;
         case FT_UNKNOWN:

image/xisf/include/xisfexception.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "imageloadexception.h"
+
+namespace ELS
+{
+
+    class XISFException : public ImageLoadException
+    {
+    public:
+        XISFException(const char* errText);
+        virtual ~XISFException();
+
+        virtual const char* getErrText() const;
+
+    protected:
+        XISFException();
+
+    protected:
+        static const int g_bufSize = 200;
+
+    protected:
+        char _errText[g_bufSize];
+    };
+
+}

image/xisf/include/xisfimage.h

@@ -0,0 +1,94 @@
+#pragma once
+
+// Need to define this properly, but it's all linux all the time right now
+#define __PCL_LINUX
+
+// Suppress the MANY warnings from PCL
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wparentheses"
+#pragma GCC diagnostic ignored "-Wdangling-else"
+#include <pcl/XISF.h>
+#pragma GCC diagnostic pop
+
+#include <inttypes.h>
+
+#include "image.h"
+#include "pixelvisitor.h"
+#include "rastertypes.h"
+
+namespace ELS
+{
+
+    class XISFImage : public Image
+    {
+    public:
+        static XISFImage* load(const char* filename);
+
+    public:
+        virtual ~XISFImage() override;
+
+        virtual bool isColor() const override;
+
+        virtual int getWidth() const override;
+        virtual int getHeight() const override;
+
+        virtual RasterFormat getRasterFormat() const override;
+        virtual SampleFormat getSampleFormat() const override;
+
+        virtual void visitPixels(PixelVisitor* visitor) const override;
+
+    private:
+        XISFImage(SampleFormat sampleFormat,
+                  bool isColor,
+                  int width,
+                  int height,
+                  pcl::UInt8Image* img);
+        XISFImage(SampleFormat sampleFormat,
+                  bool isColor,
+                  int width,
+                  int height,
+                  pcl::UInt16Image* img);
+        XISFImage(SampleFormat sampleFormat,
+                  bool isColor,
+                  int width,
+                  int height,
+                  pcl::UInt32Image* img);
+        XISFImage(SampleFormat sampleFormat,
+                  bool isColor,
+                  int width,
+                  int height,
+                  pcl::FImage* img);
+        XISFImage(SampleFormat sampleFormat,
+                  bool isColor,
+                  int width,
+                  int height,
+                  pcl::DImage* img);
+
+        void visitPixels(pcl::UInt8Image* img,
+                         PixelVisitor* visitor) const;
+        void visitPixels(pcl::UInt16Image* img,
+                         PixelVisitor* visitor) const;
+        void visitPixels(pcl::UInt32Image* img,
+                         PixelVisitor* visitor) const;
+        void visitPixels(pcl::FImage* img,
+                         PixelVisitor* visitor) const;
+        void visitPixels(pcl::DImage* img,
+                         PixelVisitor* visitor) const;
+
+    private:
+        SampleFormat _sampleFormat;
+        bool _isColor;
+        int _width;
+        int _height;
+        union
+        {
+            pcl::UInt8Image* u8;
+            pcl::UInt16Image* u16;
+            pcl::UInt32Image* u32;
+            pcl::FImage* f;
+            pcl::DImage* d;
+        } _pixels;
+    };
+
+}

image/xisf/src/xisfexception.cpp

@@ -0,0 +1,29 @@
+#include <string.h>
+
+#include "xisfexception.h"
+
+namespace ELS
+{
+
+    XISFException::XISFException(const char* errText)
+    {
+        strncpy(_errText, errText, g_bufSize - 1);
+        _errText[g_bufSize - 1] = 0;
+    }
+
+    /* virtual */
+    XISFException::~XISFException() {}
+
+    /* virtual */
+    const char* XISFException::getErrText() const
+    {
+        return _errText;
+    }
+
+    /* protected */
+    XISFException::XISFException()
+    {
+        _errText[g_bufSize - 1] = 0;
+    }
+
+}