Fixed samples build with nonfree.

diff --git a/samples/c/CMakeLists.txt b/samples/c/CMakeLists.txt
index a91ac93..b61188f 100644 (file)
--- a/samples/c/CMakeLists.txt
+++ b/samples/c/CMakeLists.txt
@@ -16,7 +16,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
   endif()
 
-  ocv_include_modules(${OPENCV_C_SAMPLES_REQUIRED_DEPS})
+  ocv_include_modules(${OPENCV_C_SAMPLES_REQUIRED_DEPS} opencv_nonfree)
 
   # ---------------------------------------------
   #      Define executable targets

diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 6eb1bdc..d20b9cf 100644 (file)
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -15,7 +15,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
   project(cpp_samples)
 
   ocv_include_directories("${OpenCV_SOURCE_DIR}/include")#for opencv.hpp
-  ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
+  ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS} opencv_nonfree)
 
   if(HAVE_opencv_gpu)
     ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")

diff --git a/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp b/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
index 2fcd884..aeabd8e 100644 (file)
--- a/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
+++ b/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
@@ -80,6 +80,6 @@ int main( int argc, char** argv )
  * @function readme
  */
 void readme()
-{ std::cout << " Usage: ./SURF_descriptor <img1> <img2>" << std::endl; }
+{ printf(" Usage: ./SURF_descriptor <img1> <img2>\n"); }
 
 #endif
\ No newline at end of file

diff --git a/samples/ocl/CMakeLists.txt b/samples/ocl/CMakeLists.txt
index d973d3f..5961b50 100644 (file)
--- a/samples/ocl/CMakeLists.txt
+++ b/samples/ocl/CMakeLists.txt
@@ -10,7 +10,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
 
   project("${project}_samples")
 
-  ocv_include_modules(${OPENCV_OCL_SAMPLES_REQUIRED_DEPS})
+  ocv_include_modules(${OPENCV_OCL_SAMPLES_REQUIRED_DEPS} opencv_nonfree)
 
   if(HAVE_OPENCL)
     ocv_include_directories(${OPENCL_INCLUDE_DIR})