linux fixes & bump version

astrowander · Dec 4, 2023 · 153422f · 153422f
1 parent e5ddcf6
commit 153422f
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git a/App/acmb-app.pro b/App/acmb-app.pro
@@ -8,6 +8,8 @@ LIBS += -llensfun
 LIBS += -lTinyTIFFShared_Release
 LIBS += -ltbb
 LIBS += -lcudart
+LIBS += -L/usr/local/lib/ -lCCfits
+LIBS += -L/usr/local/lib/ -lcfitsio
 
 SOURCES += \
     CliParser.cpp \

diff --git a/Codecs/FITS/FitsDecoder.h b/Codecs/FITS/FitsDecoder.h
@@ -12,7 +12,7 @@ ACMB_NAMESPACE_BEGIN
 
 class FitsDecoder : public ImageDecoder
 {
-    std::unique_ptr<CCfits::FITS> _pFits;
+    std::shared_ptr<CCfits::FITS> _pFits;
 
 public:
     FitsDecoder( PixelFormat outputFormat = PixelFormat::Unspecified );

diff --git a/Codecs/imagedecoder.cpp b/Codecs/imagedecoder.cpp
@@ -3,7 +3,7 @@
 #include "PPM/ppmdecoder.h"
 #include "Raw/RawDecoder.h"
 #include "Tiff/TiffDecoder.h"
-#include "Fits/FitsDecoder.h"
+#include "FITS/FitsDecoder.h"
 
 #include "./../Transforms/DebayerTransform.h"
 #include "./../Transforms/converter.h"

diff --git a/Core/versioning.h b/Core/versioning.h
@@ -1,6 +1,6 @@
 #pragma once
 #define MAJOR_VERSION "1"
 #define MINOR_VERSION "0"
-#define REVISION_VERSION "0"
-#define BUILD_NUMBER "4"
+#define REVISION_VERSION "1"
+#define BUILD_NUMBER "0"
 #define FULL_VERSION MAJOR_VERSION "." MINOR_VERSION "." REVISION_VERSION "." BUILD_NUMBER
diff --git a/GUI/acmb-gui.pro b/GUI/acmb-gui.pro
@@ -11,6 +11,8 @@ LIBS += -ltbb
 LIBS += -lcudart
 LIBS += -lglfw
 LIBS += -lvulkan
+LIBS += -L/usr/local/lib/ -lCCfits
+LIBS += -L/usr/local/lib/ -lcfitsio
 
 LIBS += -L$$OUT_PWD/../ -lacmb-lib
 LIBS += -L$$OUT_PWD/../Cuda/ -lacmb-cuda

diff --git a/Server/acmb-server.pro b/Server/acmb-server.pro
@@ -9,6 +9,8 @@ LIBS += -lTinyTIFFShared_Release
 LIBS += -ltbb
 LIBS += -lcudart
 LIBS += -lboost_system
+LIBS += -L/usr/local/lib/ -lCCfits
+LIBS += -L/usr/local/lib/ -lcfitsio
 
 SOURCES += \
     main.cpp \

diff --git a/Tests/TestFitsDecoder.cpp b/Tests/TestFitsDecoder.cpp
@@ -1,6 +1,6 @@
 #include "test.h"
 #include "testtools.h"
-#include "../Codecs/Fits/FitsDecoder.h"
+#include "../Codecs/FITS/FitsDecoder.h"
 #include "../Core/bitmap.h"
 
 ACMB_TESTS_NAMESPACE_BEGIN
@@ -70,4 +70,4 @@ END_TEST
 
 END_SUITE
 
-ACMB_TESTS_NAMESPACE_END
+ACMB_TESTS_NAMESPACE_END
diff --git a/Tests/acmb-tests.pro b/Tests/acmb-tests.pro
@@ -7,6 +7,8 @@ LIBS += -L/usr/local/lib/ -lraw
 LIBS += -llensfun
 LIBS += -lTinyTIFFShared_Release
 LIBS += -ltbb
+LIBS += -L/usr/local/lib/ -lCCfits
+LIBS += -L/usr/local/lib/ -lcfitsio
 
 HEADERS += \
     TestRunner.h \
@@ -24,6 +26,8 @@ SOURCES += \
     TestDeaberrateTransform.cpp \
     TestDebayerTransform.cpp \
     TestFastAligner.cpp \
+    TestFitsDecoder.cpp \
+    TestFitsEncoder.cpp \
     TestHaloRemoval.cpp \
     TestHistogramBuilder.cpp \
     TestImageDecoder.cpp \

diff --git a/acmb-lib.pro b/acmb-lib.pro
@@ -10,9 +10,12 @@ TARGET = acmb-lib
 TEMPLATE = lib
 CONFIG += staticlib
 CONFIG += c++2a
+INCLUDEPATH += Libs/cfitsio/include
 
 SOURCES += \
     AGG/agg_trans_affine.cpp \
+    Codecs/FITS/FitsDecoder.cpp \
+    Codecs/FITS/FitsEncoder.cpp \
     Codecs/imageencoder.cpp \
     Codecs/imagedecoder.cpp \
     Codecs/JPEG/toojpeg/toojpeg.cpp \
@@ -54,6 +57,8 @@ HEADERS += \
     AGG/agg_trans_affine.h \
     AGG/agg_config.h \
     AGG/agg_basics.h \
+    Codecs/FITS/FitsDecoder.h \
+    Codecs/FITS/FitsEncoder.h \
     Codecs/Raw/RawSettings.h \
     Codecs/imageencoder.h \
     Codecs/imagedecoder.h \