From 29e3caf3e4ac8adc00a77446d98f54cb006d05b2 Mon Sep 17 00:00:00 2001 From: Suleyman TURKMEN Date: Thu, 27 Jul 2017 18:14:01 +0300 Subject: [PATCH] Update line_descriptor samples --- modules/line_descriptor/samples/compute_descriptors.cpp | 3 ++- modules/line_descriptor/samples/knn_matching.cpp | 3 ++- modules/line_descriptor/samples/lines_extraction.cpp | 3 ++- modules/line_descriptor/samples/lsd_lines_extraction.cpp | 3 ++- modules/line_descriptor/samples/matching.cpp | 3 ++- modules/line_descriptor/samples/radius_matching.cpp | 4 ++-- modules/xfeatures2d/CMakeLists.txt | 2 +- modules/xfeatures2d/samples/bagofwords_classification.cpp | 2 +- modules/xfeatures2d/samples/shape_transformation.cpp | 3 ++- modules/xfeatures2d/samples/video_homography.cpp | 1 + 10 files changed, 17 insertions(+), 10 deletions(-) diff --git a/modules/line_descriptor/samples/compute_descriptors.cpp b/modules/line_descriptor/samples/compute_descriptors.cpp index 680043038..214b29d4f 100644 --- a/modules/line_descriptor/samples/compute_descriptors.cpp +++ b/modules/line_descriptor/samples/compute_descriptors.cpp @@ -40,11 +40,12 @@ //M*/ #include +#include #ifdef HAVE_OPENCV_FEATURES2D #include -#include "opencv2/core/utility.hpp" +#include #include #include #include diff --git a/modules/line_descriptor/samples/knn_matching.cpp b/modules/line_descriptor/samples/knn_matching.cpp index f2399224b..55df693de 100644 --- a/modules/line_descriptor/samples/knn_matching.cpp +++ b/modules/line_descriptor/samples/knn_matching.cpp @@ -40,11 +40,12 @@ //M*/ #include +#include #ifdef HAVE_OPENCV_FEATURES2D #include -#include "opencv2/core/utility.hpp" +#include #include #include #include diff --git a/modules/line_descriptor/samples/lines_extraction.cpp b/modules/line_descriptor/samples/lines_extraction.cpp index d76327f9e..f8adc1fd0 100644 --- a/modules/line_descriptor/samples/lines_extraction.cpp +++ b/modules/line_descriptor/samples/lines_extraction.cpp @@ -40,11 +40,12 @@ //M*/ #include +#include #ifdef HAVE_OPENCV_FEATURES2D #include -#include "opencv2/core/utility.hpp" +#include #include #include #include diff --git a/modules/line_descriptor/samples/lsd_lines_extraction.cpp b/modules/line_descriptor/samples/lsd_lines_extraction.cpp index 6a0c26697..da0122598 100644 --- a/modules/line_descriptor/samples/lsd_lines_extraction.cpp +++ b/modules/line_descriptor/samples/lsd_lines_extraction.cpp @@ -40,11 +40,12 @@ //M*/ #include +#include #ifdef HAVE_OPENCV_FEATURES2D #include -#include "opencv2/core/utility.hpp" +#include #include #include #include diff --git a/modules/line_descriptor/samples/matching.cpp b/modules/line_descriptor/samples/matching.cpp index 7a571a82b..27147064f 100644 --- a/modules/line_descriptor/samples/matching.cpp +++ b/modules/line_descriptor/samples/matching.cpp @@ -40,11 +40,12 @@ //M*/ #include +#include #ifdef HAVE_OPENCV_FEATURES2D #include -#include "opencv2/core/utility.hpp" +#include #include #include #include diff --git a/modules/line_descriptor/samples/radius_matching.cpp b/modules/line_descriptor/samples/radius_matching.cpp index 0ec8bcad3..05b26c605 100644 --- a/modules/line_descriptor/samples/radius_matching.cpp +++ b/modules/line_descriptor/samples/radius_matching.cpp @@ -40,12 +40,12 @@ //M*/ #include +#include #ifdef HAVE_OPENCV_FEATURES2D #include - -#include "opencv2/core/utility.hpp" +#include #include #include #include diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt index e17555956..79565b20b 100644 --- a/modules/xfeatures2d/CMakeLists.txt +++ b/modules/xfeatures2d/CMakeLists.txt @@ -1,6 +1,6 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection") -ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_cudaarithm WRAP python java) +ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake) diff --git a/modules/xfeatures2d/samples/bagofwords_classification.cpp b/modules/xfeatures2d/samples/bagofwords_classification.cpp index 8525ffd2f..0c9121399 100644 --- a/modules/xfeatures2d/samples/bagofwords_classification.cpp +++ b/modules/xfeatures2d/samples/bagofwords_classification.cpp @@ -1,8 +1,8 @@ #include +#include "opencv2/opencv_modules.hpp" #ifdef HAVE_OPENCV_ML -#include "opencv2/opencv_modules.hpp" #include "opencv2/imgcodecs.hpp" #include "opencv2/highgui.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/xfeatures2d/samples/shape_transformation.cpp b/modules/xfeatures2d/samples/shape_transformation.cpp index 3c83b612c..35526c77b 100644 --- a/modules/xfeatures2d/samples/shape_transformation.cpp +++ b/modules/xfeatures2d/samples/shape_transformation.cpp @@ -2,6 +2,7 @@ * shape_context.cpp -- Shape context demo for shape matching */ #include +#include "opencv2/opencv_modules.hpp" #ifdef HAVE_OPENCV_SHAPE @@ -11,7 +12,7 @@ #include "opencv2/imgproc.hpp" #include "opencv2/features2d.hpp" #include "opencv2/xfeatures2d.hpp" -#include +#include "opencv2/core/utility.hpp" #include using namespace std; diff --git a/modules/xfeatures2d/samples/video_homography.cpp b/modules/xfeatures2d/samples/video_homography.cpp index 7252fd64b..709936e6f 100644 --- a/modules/xfeatures2d/samples/video_homography.cpp +++ b/modules/xfeatures2d/samples/video_homography.cpp @@ -6,6 +6,7 @@ */ #include +#include "opencv2/opencv_modules.hpp" #ifdef HAVE_OPENCV_CALIB3D