Skip to content
Snippets Groups Projects
Commit ec4cdd3f authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Merge branch 'enhancement/fixstarssgm-build' into 'master'

Fix FixstarsSGM CMake option

See merge request nicolas.pope/ftl!174
parents 5a02416a fe3d231d
No related branches found
No related tags found
1 merge request!174Fix FixstarsSGM CMake option
Pipeline #16476 passed
...@@ -10,7 +10,6 @@ set(OPERSRC ...@@ -10,7 +10,6 @@ set(OPERSRC
src/filling.cu src/filling.cu
src/disparity/disp2depth.cu src/disparity/disp2depth.cu
src/disparity/disparity_to_depth.cpp src/disparity/disparity_to_depth.cpp
src/disparity/fixstars_sgm.cpp
src/disparity/bilateral_filter.cpp src/disparity/bilateral_filter.cpp
src/segmentation.cu src/segmentation.cu
src/segmentation.cpp src/segmentation.cpp
...@@ -20,6 +19,11 @@ set(OPERSRC ...@@ -20,6 +19,11 @@ set(OPERSRC
src/antialiasing.cu src/antialiasing.cu
) )
if (LIBSGM_FOUND)
list(APPEND OPERSRC src/disparity/fixstars_sgm.cpp)
endif (LIBSGM_FOUND)
if (HAVE_OPTFLOW) if (HAVE_OPTFLOW)
list(APPEND OPERSRC list(APPEND OPERSRC
src/nvopticalflow.cpp src/nvopticalflow.cpp
......
...@@ -7,16 +7,18 @@ ...@@ -7,16 +7,18 @@
#include <opencv2/cudaoptflow.hpp> #include <opencv2/cudaoptflow.hpp>
#endif #endif
#ifdef HAVE_LIBSGM
#include <libsgm.h> #include <libsgm.h>
#endif
namespace ftl { namespace ftl {
namespace operators { namespace operators {
#ifdef HAVE_LIBSGM
/* /*
* FixstarsSGM https://github.com/fixstars/libSGM * FixstarsSGM https://github.com/fixstars/libSGM
* *
* Requires modified version https://gitlab.utu.fi/joseha/libsgm * Requires modified version https://gitlab.utu.fi/joseha/libsgm
*
*/ */
class FixstarsSGM : public ftl::operators::Operator { class FixstarsSGM : public ftl::operators::Operator {
public: public:
...@@ -41,6 +43,7 @@ class FixstarsSGM : public ftl::operators::Operator { ...@@ -41,6 +43,7 @@ class FixstarsSGM : public ftl::operators::Operator {
int max_disp_; int max_disp_;
float uniqueness_; float uniqueness_;
}; };
#endif
class DisparityBilateralFilter : public::ftl::operators::Operator { class DisparityBilateralFilter : public::ftl::operators::Operator {
public: public:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment