diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /dev-ros/laser_cb_detector/files | |
parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) |
gentoo resync : 07.08.2021
Diffstat (limited to 'dev-ros/laser_cb_detector/files')
-rw-r--r-- | dev-ros/laser_cb_detector/files/boost170.patch | 13 | ||||
-rw-r--r-- | dev-ros/laser_cb_detector/files/gcc6.patch | 13 | ||||
-rw-r--r-- | dev-ros/laser_cb_detector/files/ocv4-2.patch | 34 | ||||
-rw-r--r-- | dev-ros/laser_cb_detector/files/ocv4.patch | 13 |
4 files changed, 0 insertions, 73 deletions
diff --git a/dev-ros/laser_cb_detector/files/boost170.patch b/dev-ros/laser_cb_detector/files/boost170.patch deleted file mode 100644 index 019a948be95c..000000000000 --- a/dev-ros/laser_cb_detector/files/boost170.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: laser_cb_detector/CMakeLists.txt -=================================================================== ---- laser_cb_detector.orig/CMakeLists.txt -+++ laser_cb_detector/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 2.8.3) - project(laser_cb_detector) - --find_package(Boost REQUIRED signals thread) -+find_package(Boost REQUIRED thread) - find_package(catkin REQUIRED actionlib actionlib_msgs cv_bridge image_cb_detector message_filters roscpp settlerlib std_msgs) - - add_action_files(DIRECTORY action FILES Config.action) diff --git a/dev-ros/laser_cb_detector/files/gcc6.patch b/dev-ros/laser_cb_detector/files/gcc6.patch deleted file mode 100644 index 6580ca5e8453..000000000000 --- a/dev-ros/laser_cb_detector/files/gcc6.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: laser_cb_detector/CMakeLists.txt -=================================================================== ---- laser_cb_detector.orig/CMakeLists.txt -+++ laser_cb_detector/CMakeLists.txt -@@ -15,7 +15,7 @@ catkin_package(DEPENDS actionlib actionl - ) - - find_package(OpenCV REQUIRED) --include_directories(SYSTEM ${catkin_INCLUDE_DIRS} -+include_directories(${catkin_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS} - ) - include_directories(include) diff --git a/dev-ros/laser_cb_detector/files/ocv4-2.patch b/dev-ros/laser_cb_detector/files/ocv4-2.patch deleted file mode 100644 index 3cc51c45d7dd..000000000000 --- a/dev-ros/laser_cb_detector/files/ocv4-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: laser_cb_detector/test/laser_cb_detector_unittest.cpp -=================================================================== ---- laser_cb_detector.orig/test/laser_cb_detector_unittest.cpp -+++ laser_cb_detector/test/laser_cb_detector_unittest.cpp -@@ -37,7 +37,7 @@ - - #include <laser_cb_detector/ConfigGoal.h> - #include <laser_cb_detector/laser_cb_detector.h> --#include <opencv/highgui.h> -+#include <opencv2/highgui.hpp> - - using namespace laser_cb_detector; - using namespace std; -@@ -55,8 +55,9 @@ static const string test_path = xstr(TES - - calibration_msgs::DenseLaserSnapshot getSnapshot(const string& filename) - { -- IplImage* image; -- image = cvLoadImage(filename.c_str(), 0); // 0 -> Force image to grayscale -+ cv::Mat mat = cv::imread(filename.c_str(), 0); -+ IplImage image_v = cvIplImage(mat); -+ IplImage* image = &image_v; - EXPECT_TRUE(image) << "could not open image file [" << filename << "]" << endl; - - -@@ -92,7 +93,7 @@ calibration_msgs::DenseLaserSnapshot get - } - - cvReleaseImage(&float_image); -- cvReleaseImage(&image); -+ //cvReleaseImage(&image); - - return snapshot; - } diff --git a/dev-ros/laser_cb_detector/files/ocv4.patch b/dev-ros/laser_cb_detector/files/ocv4.patch deleted file mode 100644 index 4bbb0005fda0..000000000000 --- a/dev-ros/laser_cb_detector/files/ocv4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h -=================================================================== ---- laser_cb_detector.orig/include/laser_cb_detector/laser_cb_detector.h -+++ laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h -@@ -37,7 +37,7 @@ - #ifndef LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_ - #define LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_ - --#include <opencv/cv.h> -+#include <opencv2/core/core_c.h> - #include <calibration_msgs/DenseLaserSnapshot.h> - #include <laser_cb_detector/ConfigAction.h> - #include <laser_cb_detector/cv_laser_bridge.h> |