fix OpenCV3 build

ros-perception · Jan 3, 2016 · 8ed5ff5 · 8ed5ff5
1 parent 287959c
commit 8ed5ff5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt
@@ -35,7 +35,7 @@ if (PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
   add_definitions(-DPYTHON3)
 endif()
 
-if (OpenCV_VERSION VERSION_EQUAL "3")
+if (OpenCV_VERSION_MAJOR VERSION_EQUAL 3)
 add_library(${PROJECT_NAME}_boost module.cpp module_opencv3.cpp)
 else()
 add_library(${PROJECT_NAME}_boost module.cpp module_opencv2.cpp)

diff --git a/opencv_apps/src/nodelet/simple_flow_nodelet.cpp b/opencv_apps/src/nodelet/simple_flow_nodelet.cpp
@@ -45,6 +45,9 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/video/tracking.hpp>
+#if CV_MAJOR_VERSION == 3
+#include <opencv2/optflow.hpp>
+#endif
 
 #include <dynamic_reconfigure/server.h>
 #include "opencv_apps/SimpleFlowConfig.h"
@@ -145,7 +148,11 @@ class SimpleFlowNodelet : public nodelet::Nodelet
       }
 
       float start = (float)cv::getTickCount();
+#if CV_MAJOR_VERSION == 3
+      cv::optflow::calcOpticalFlowSF(gray, prevGray,
+#else
       cv::calcOpticalFlowSF(gray, prevGray,
+#endif
                             flow,
                             3, 2, 4, 4.1, 25.5, 18, 55.0, 25.5, 0.35, 18, 55.0, 25.5, 10);
       NODELET_INFO("calcOpticalFlowSF : %lf sec", (cv::getTickCount() - start) / cv::getTickFrequency());