1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
Index: image_publisher/CMakeLists.txt
===================================================================
--- image_publisher.orig/CMakeLists.txt
+++ image_publisher/CMakeLists.txt
@@ -10,7 +10,7 @@ message(STATUS "opencv version ${OpenCV_
if(OpenCV_VERSION VERSION_LESS "3.0.0")
find_package(OpenCV 2 REQUIRED COMPONENTS ${opencv_2_components})
else()
- find_package(OpenCV 3 REQUIRED COMPONENTS ${opencv_3_components})
+ find_package(OpenCV REQUIRED COMPONENTS ${opencv_3_components})
endif()
# generate the dynamic_reconfigure config file
Index: image_publisher/src/nodelet/image_publisher_nodelet.cpp
===================================================================
--- image_publisher.orig/src/nodelet/image_publisher_nodelet.cpp
+++ image_publisher/src/nodelet/image_publisher_nodelet.cpp
@@ -95,7 +95,7 @@ class ImagePublisherNodelet : public nod
{
if ( cap_.isOpened() ) {
if ( ! cap_.read(image_) ) {
- cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
+ cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
}
}
if (flip_image_)
@@ -136,7 +136,7 @@ public:
nh_.param("filename", filename_, std::string(""));
NODELET_INFO("File name for publishing image is : %s", filename_.c_str());
try {
- image_ = cv::imread(filename_, CV_LOAD_IMAGE_COLOR);
+ image_ = cv::imread(filename_, cv::IMREAD_COLOR);
if ( image_.empty() ) { // if filename is motion file or device file
try { // if filename is number
int num = boost::lexical_cast<int>(filename_);//num is 1234798797
@@ -146,7 +146,7 @@ public:
}
CV_Assert(cap_.isOpened());
cap_.read(image_);
- cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
+ cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
}
CV_Assert(!image_.empty());
}
|
GitWeb
