gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-ros/compressed_depth_image_transport: fix build with opencv4

Browse Source 
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Alexis Ballier
2019-12-10 17:21:52 +01:00
parent cfad122869
commit ed5d0a390a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,8 +18,9 @@ RDEPEND="
dev-ros/cv_bridge
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-ros/image_transport
media-libs/opencv:=
>=media-libs/opencv-4:=
dev-libs/boost:=
dev-libs/console_bridge:=
"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/ocv4.patch" )

13
dev-ros/compressed_depth_image_transport/files/ocv4.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: compressed_depth_image_transport/src/codec.cpp
===================================================================
--- compressed_depth_image_transport.orig/src/codec.cpp
+++ compressed_depth_image_transport/src/codec.cpp
@@ -135,7 +135,7 @@ sensor_msgs::Image::Ptr decodeCompressed
// Decode raw image
try
{
- cv_ptr->image = cv::imdecode(imageData, CV_LOAD_IMAGE_UNCHANGED);
+ cv_ptr->image = cv::imdecode(imageData, cv::IMREAD_UNCHANGED);
}
catch (cv::Exception& e)
{