Merge pull request opencv#6745 from alalek:viz_samples

daedric · Jul 1, 2016 · 7dc5332 · 7dc5332
2 parents 330e4bb + 8184535
commit 7dc5332
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/modules/core/include/opencv2/core/types.hpp b/modules/core/include/opencv2/core/types.hpp
@@ -231,7 +231,11 @@ template<typename _Tp> class Point3_
     //! conversion to another data type
     template<typename _Tp2> operator Point3_<_Tp2>() const;
     //! conversion to cv::Vec<>
+#if OPENCV_ABI_COMPATIBILITY > 300
+    template<typename _Tp2> operator Vec<_Tp2, 3>() const;
+#else
     operator Vec<_Tp, 3>() const;
+#endif
 
     //! dot product
     _Tp dot(const Point3_& pt) const;
@@ -1326,11 +1330,19 @@ Point3_<_Tp>::operator Point3_<_Tp2>() const
     return Point3_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y), saturate_cast<_Tp2>(z));
 }
 
+#if OPENCV_ABI_COMPATIBILITY > 300
+template<typename _Tp> template<typename _Tp2> inline
+Point3_<_Tp>::operator Vec<_Tp2, 3>() const
+{
+    return Vec<_Tp2, 3>(x, y, z);
+}
+#else
 template<typename _Tp> inline
 Point3_<_Tp>::operator Vec<_Tp, 3>() const
 {
     return Vec<_Tp, 3>(x, y, z);
 }
+#endif
 
 template<typename _Tp> inline
 Point3_<_Tp>& Point3_<_Tp>::operator = (const Point3_& pt)

diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
@@ -31,7 +31,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
   endif()
 
   if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-missing-declarations")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function -Wno-missing-declarations")
   endif()
 
   # ---------------------------------------------
@@ -57,8 +58,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
       ocv_target_link_libraries(${the_target} opencv_cudaarithm opencv_cudafilters)
     endif()
 
-    if(HAVE_opencv_ocl)
-      ocv_target_link_libraries(${the_target} opencv_ocl)
+    if("${srcs}" MATCHES "viz/" AND VTK_USE_FILE)
+      include(${VTK_USE_FILE})
+      ocv_target_link_libraries(${the_target} ${VTK_LIBRARIES})
+      add_definitions(-DUSE_VTK)
     endif()
 
     set_target_properties(${the_target} PROPERTIES
@@ -88,7 +91,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     ocv_list_filterout(cpp_samples "/gpu/")
   endif()
 
-  ocv_list_filterout(cpp_samples "viz")
+  if(NOT TARGET opencv_viz)
+    ocv_list_filterout(cpp_samples "/viz/")
+  endif()
 
   if(NOT HAVE_IPP_A)
     ocv_list_filterout(cpp_samples "/ippasync/")

diff --git a/samples/cpp/tutorial_code/viz/creating_widgets.cpp b/samples/cpp/tutorial_code/viz/creating_widgets.cpp
@@ -4,6 +4,14 @@
  * @author Ozan Cagri Tonkal
  */
 
+#ifndef USE_VTK
+#include <iostream>
+int main()
+{
+    std::cout << "This sample requires direct compilation with VTK. Stop" << std::endl;
+    return 0;
+}
+#else
 #include <opencv2/viz.hpp>
 #include <opencv2/viz/widget_accessor.hpp>
 #include <iostream>
@@ -111,3 +119,4 @@ int main()
 
     return 0;
 }
+#endif
diff --git a/samples/cpp/tutorial_code/viz/launching_viz.cpp b/samples/cpp/tutorial_code/viz/launching_viz.cpp
@@ -41,7 +41,7 @@ int main()
     cout << "First event loop is over" << endl;
 
     /// Access window via its name
-    viz::Viz3d sameWindow = viz::get("Viz Demo");
+    viz::Viz3d sameWindow = viz::getWindowByName("Viz Demo");
 
     /// Start event loop
     sameWindow.spin();