Merge pull request #1298 from sturkmen72:update_line_descriptor_samples

Author: alalek

modules/line_descriptor/samples/compute_descriptors.cpp

@@ -40,11 +40,12 @@
  //M*/
 
 #include <iostream>
+#include <opencv2/opencv_modules.hpp>
 
 #ifdef HAVE_OPENCV_FEATURES2D
 
 #include <opencv2/line_descriptor.hpp>
-#include "opencv2/core/utility.hpp"
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/highgui.hpp>

modules/line_descriptor/samples/knn_matching.cpp

@@ -40,11 +40,12 @@
  //M*/
 
 #include <iostream>
+#include <opencv2/opencv_modules.hpp>
 
 #ifdef HAVE_OPENCV_FEATURES2D
 
 #include <opencv2/line_descriptor.hpp>
-#include "opencv2/core/utility.hpp"
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/highgui.hpp>

modules/line_descriptor/samples/lines_extraction.cpp

@@ -40,11 +40,12 @@
  //M*/
 
 #include <iostream>
+#include <opencv2/opencv_modules.hpp>
 
 #ifdef HAVE_OPENCV_FEATURES2D
 
 #include <opencv2/line_descriptor.hpp>
-#include "opencv2/core/utility.hpp"
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/highgui.hpp>

modules/line_descriptor/samples/lsd_lines_extraction.cpp

@@ -40,11 +40,12 @@
  //M*/
 
 #include <iostream>
+#include <opencv2/opencv_modules.hpp>
 
 #ifdef HAVE_OPENCV_FEATURES2D
 
 #include <opencv2/line_descriptor.hpp>
-#include "opencv2/core/utility.hpp"
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/highgui.hpp>

modules/line_descriptor/samples/matching.cpp

@@ -40,11 +40,12 @@
  //M*/
 
 #include <iostream>
+#include <opencv2/opencv_modules.hpp>
 
 #ifdef HAVE_OPENCV_FEATURES2D
 
 #include <opencv2/line_descriptor.hpp>
-#include "opencv2/core/utility.hpp"
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/highgui.hpp>

modules/line_descriptor/samples/radius_matching.cpp

@@ -40,12 +40,12 @@
  //M*/
 
 #include <iostream>
+#include <opencv2/opencv_modules.hpp>
 
 #ifdef HAVE_OPENCV_FEATURES2D
 
 #include <opencv2/line_descriptor.hpp>
-
-#include "opencv2/core/utility.hpp"
+#include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/highgui.hpp>

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)

modules/xfeatures2d/samples/bagofwords_classification.cpp

@@ -1,8 +1,8 @@
 #include <iostream>
+#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"

modules/xfeatures2d/samples/shape_transformation.cpp

@@ -2,6 +2,7 @@
  * shape_context.cpp -- Shape context demo for shape matching
  */
 #include <iostream>
+#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 <opencv2/core/utility.hpp>
+#include "opencv2/core/utility.hpp"
 #include <string>
 
 using namespace std;

modules/xfeatures2d/samples/video_homography.cpp

@@ -6,6 +6,7 @@
 */
 
 #include <iostream>
+#include "opencv2/opencv_modules.hpp"
 
 #ifdef HAVE_OPENCV_CALIB3D