Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make xfeatures2d optional #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make xfeatures2d optional #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions M3T/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ project(M3T)
option(USE_AZURE_KINECT "Use Azure Kinect" ON)
option(USE_REALSENSE "Use RealSense D435" ON)
option(USE_GTEST "Use gtest" ON)
option(USE_XFEATURES2D "Use OpenCV xfeatures2d" OFF)


# Libraries
Expand All @@ -32,7 +33,14 @@ if (UNIX)
endif ()
find_package(OpenGL REQUIRED)
find_package(glfw3 3.1.2 REQUIRED)
find_package(OpenCV 4.3.0 REQUIRED COMPONENTS core imgproc highgui imgcodecs calib3d features2d xfeatures2d OPTIONAL_COMPONENTS cudafeatures2d)

set(OpenCV_COMPONENTS core imgproc highgui imgcodecs calib3d features2d)
if(USE_XFEATURES2D)
add_definitions( -DUSE_XFEATURES2D=TRUE )
set(OpenCV_COMPONENTS ${OpenCV_COMPONENTS} xfeatures2d)
endif()

find_package(OpenCV 4.3.0 REQUIRED COMPONENTS ${OpenCV_COMPONENTS} OPTIONAL_COMPONENTS cudafeatures2d)

if (USE_AZURE_KINECT)
find_package(k4a 1.3.0 REQUIRED)
Expand Down Expand Up @@ -122,7 +130,7 @@ if (USE_REALSENSE)
add_definitions( -DUSE_REALSENSE=TRUE )
endif ()
if(OpenCV_CUDA_VERSION)
add_definitions( -DUSE_CUDA=TRUE )
add_definitions( -DUSE_CUDA=TRUE )
endif ()
if (USE_GTEST)
add_definitions( -DUSE_GTEST=TRUE )
Expand Down
2 changes: 2 additions & 0 deletions M3T/include/m3t/texture_modality.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
#include <deque>
#include <opencv2/features2d.hpp>
#include <opencv2/opencv.hpp>
#ifdef USE_XFEATURES2D
#include <opencv2/xfeatures2d.hpp>
#endif
#include <string>
#include <vector>

Expand Down
2 changes: 2 additions & 0 deletions M3T/src/texture_modality.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,7 @@ void TextureModality::SetUpFeatureDetectorAndMatcher() {
feature_descriptor_ = cv::BRISK::create(brisk_threshold_, brisk_octave_,
brisk_pattern_scale_);
break;
#ifdef USE_XFEATURES2D
case DescriptorType::DAISY:
feature_detector_ =
cv::ORB::create(orb_n_features_, orb_scale_factor_, orb_n_levels_);
Expand All @@ -769,6 +770,7 @@ void TextureModality::SetUpFeatureDetectorAndMatcher() {
sift_n_features_, sift_n_octave_layers_, sift_contrast_threshold_,
sift_edge_threshold_, sift_sigma_);
break;
#endif
#ifdef USE_CUDA
case DescriptorType::ORB_CUDA:
feature_detector_orb_cuda_ = cv::cuda::ORB::create(
Expand Down