Merge branch 'feature/reducedep' into 'master'

Reduce OpenCV dependencies

See merge request nicolas.pope/ftl!231

applications/calibration-multi/src/main.cpp

@@ -12,6 +12,7 @@
 #include <opencv2/core.hpp>
 #include <opencv2/aruco.hpp>
 #include <opencv2/core/eigen.hpp>
+#include <opencv2/opencv.hpp>
 
 #include <algorithm>
 #include <numeric>

applications/gui/src/camera.cpp

@@ -3,6 +3,9 @@
 #include "screen.hpp"
 #include <nanogui/glutil.h>
 
+#include <opencv2/imgproc.hpp>
+#include <opencv2/imgcodecs.hpp>
+
 #include <ftl/operators/antialiasing.hpp>
 
 #define LOGURU_REPLACE_GLOG 1

applications/gui/src/gltexture.hpp

 #ifndef _FTL_GUI_GLTEXTURE_HPP_
 #define _FTL_GUI_GLTEXTURE_HPP_
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/core/mat.hpp>
 
 namespace ftl {
 namespace gui {

applications/reconstruct/src/main.cpp

@@ -28,7 +28,7 @@
 #include <thread>
 #include <chrono>
 
-#include <opencv2/opencv.hpp>
+//#include <opencv2/opencv.hpp>
 #include <ftl/net/universe.hpp>
 
 #include <ftl/operators/smoothing.hpp>

applications/vision/include/ftl/streamer.hpp

@@ -3,7 +3,7 @@
 
 #include <ftl/net/universe.hpp>
 #include <nlohmann/json.hpp>
-#include <opencv2/opencv.hpp>
+#include <opencv2/core/mat.hpp>
 #include <string>
 
 namespace ftl {

components/codecs/include/ftl/codecs/decoder.hpp

 #ifndef _FTL_CODECS_DECODER_HPP_
 #define _FTL_CODECS_DECODER_HPP_
 
-#include <opencv2/opencv.hpp>
+//#include <opencv2/opencv.hpp>
 #include <opencv2/core/cuda.hpp>
 #include <opencv2/core/cuda_stream_accessor.hpp>
 

components/codecs/include/ftl/codecs/encoder.hpp

@@ -2,7 +2,7 @@
 #define _FTL_CODECS_ENCODER_HPP_
 
 #include <ftl/cuda_util.hpp>
-#include <opencv2/opencv.hpp>
+//#include <opencv2/core/mat.hpp>
 #include <opencv2/core/cuda.hpp>
 
 #include <ftl/codecs/codecs.hpp>

components/codecs/src/opencv_decoder.cpp

 #include <ftl/codecs/opencv_decoder.hpp>
 
+#include <opencv2/opencv.hpp>
+
 #include <loguru.hpp>
 
 using ftl::codecs::OpenCVDecoder;

components/codecs/src/opencv_encoder.cpp

 #include <ftl/codecs/opencv_encoder.hpp>
 
+#include <opencv2/opencv.hpp>
+
 #include <loguru.hpp>
 #include <vector>
 

components/codecs/test/nvpipe_codec_unit.cpp

@@ -4,6 +4,8 @@
 #include <ftl/codecs/hevc.hpp>
 #include <ftl/threads.hpp>
 
+#include <opencv2/cudaarithm.hpp>
+
 using ftl::codecs::definition_t;
 using ftl::codecs::codec_t;
 using ftl::codecs::format_t;

components/codecs/test/opencv_codec_unit.cpp

@@ -3,6 +3,8 @@
 #include <ftl/codecs/opencv_decoder.hpp>
 #include <ftl/threads.hpp>
 
+#include <opencv2/cudaarithm.hpp>
+
 using ftl::codecs::format_t;
 using ftl::codecs::definition_t;
 using ftl::codecs::codec_t;

components/operators/include/ftl/operators/disparity.hpp

@@ -7,6 +7,8 @@
 #include <opencv2/cudaoptflow.hpp>
 #endif
 
+#include <opencv2/cudastereo.hpp>
+
 #ifdef HAVE_LIBSGM
 #include <libsgm.h>
 #endif

components/operators/src/colours.cpp

 #include <ftl/operators/colours.hpp>
 
+#include <opencv2/cudaimgproc.hpp>
+#include <opencv2/cudawarping.hpp>
+
 using ftl::operators::ColourChannels;
 using ftl::codecs::Channel;
 

components/operators/src/disparity/fixstars_sgm.cpp

@@ -2,6 +2,9 @@
 
 #include "ftl/operators/disparity.hpp"
 
+#include <opencv2/cudaimgproc.hpp>
+#include <opencv2/cudaarithm.hpp>
+
 using cv::Size;
 using cv::cuda::GpuMat;
 

components/operators/src/nvopticalflow.cpp

 #include <ftl/operators/opticalflow.hpp>
 
+#include <opencv2/cudaimgproc.hpp>
+
 using ftl::rgbd::Frame;
 using ftl::rgbd::Source;
 using ftl::codecs::Channel;

components/operators/src/smoothing.cpp

@@ -6,6 +6,8 @@
 
 #include <ftl/cuda/normals.hpp>
 
+#include <opencv2/cudawarping.hpp>
+
 using ftl::operators::HFSmoother;
 using ftl::operators::SimpleMLS;
 using ftl::operators::ColourMLS;

components/renderers/cpp/src/tri_render.cpp

@@ -8,6 +8,8 @@
 #define LOGURU_REPLACE_GLOG 1
 #include <loguru.hpp>
 
+#include <opencv2/imgcodecs.hpp>
+#include <opencv2/imgproc.hpp>
 #include <opencv2/core/cuda_stream_accessor.hpp>
 
 //#include <ftl/filters/smoothing.hpp>

components/rgbd-sources/CMakeLists.txt

@@ -7,7 +7,7 @@ set(RGBDSRC
 	src/sources/stereovideo/stereovideo.cpp
 	#src/sources/net/net.cpp
 	#src/streamer.cpp
-	src/colour.cpp
+	#src/colour.cpp
 	src/group.cpp
 	src/cb_segmentation.cpp
 	#src/abr.cpp

components/rgbd-sources/include/ftl/rgbd/detail/source.hpp

@@ -3,7 +3,7 @@
 
 #include <Eigen/Eigen>
 #include <ftl/cuda_util.hpp>
-#include <opencv2/opencv.hpp>
+//#include <opencv2/opencv.hpp>
 #include <ftl/rgbd/camera.hpp>
 #include <ftl/rgbd/frame.hpp>
 

components/rgbd-sources/include/ftl/rgbd/frameset.hpp

@@ -5,7 +5,7 @@
 #include <ftl/timer.hpp>
 #include <ftl/rgbd/frame.hpp>
 
-#include <opencv2/opencv.hpp>
+//#include <opencv2/core.hpp>
 #include <vector>
 
 namespace ftl {