From 7708632e643acf0106a04add4d0accfe50f88ab7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Jul 2019 16:22:47 +0000 Subject: [PATCH] ar-track-alvar: add missing include * fixes: ar-track-alvar/0.6.1-r0/ar_track_alvar-0.6.1/src/Marker.cpp: In member function 'virtual void alvar::MarkerData::VisualizeMarkerContent(IplImage*, alvar::Camera*, double*, double*) const': ar-track-alvar/0.6.1-r0/ar_track_alvar-0.6.1/src/Marker.cpp:123:15: error: 'CV_RGB' was not declared in this scope CvScalar rgb=CV_RGB(255,255,0); ^~~~~~ Signed-off-by: Martin Jansa --- .../ar-track-alvar/fix.missing.include.patch | 31 +++++++++++++++++++ .../ar-track-alvar/ar-track-alvar_0.6.1.bb | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 recipes-ros/ar-track-alvar/ar-track-alvar/fix.missing.include.patch diff --git a/recipes-ros/ar-track-alvar/ar-track-alvar/fix.missing.include.patch b/recipes-ros/ar-track-alvar/ar-track-alvar/fix.missing.include.patch new file mode 100644 index 0000000..8afc7d8 --- /dev/null +++ b/recipes-ros/ar-track-alvar/ar-track-alvar/fix.missing.include.patch @@ -0,0 +1,31 @@ +add missing include + +* CV_RGB is defined in opencv2/imgproc.hpp +* fixes: + ar-track-alvar/0.6.1-r0/ar_track_alvar-0.6.1/src/Marker.cpp: In member function 'virtual void alvar::MarkerData::VisualizeMarkerContent(IplImage*, alvar::Camera*, double*, double*) const': + ar-track-alvar/0.6.1-r0/ar_track_alvar-0.6.1/src/Marker.cpp:123:15: error: 'CV_RGB' was not declared in this scope + CvScalar rgb=CV_RGB(255,255,0); + ^~~~~~ + +Upstream-Status: Pending + +--- a/include/ar_track_alvar/Draw.h 2019-07-03 16:28:16.540970593 +0000 ++++ b/include/ar_track_alvar/Draw.h 2019-07-03 16:19:45.113388531 +0000 +@@ -36,6 +36,7 @@ + #include "Camera.h" + #include "Line.h" + #include ++#include + + namespace alvar { + +--- a/include/ar_track_alvar/Marker.h 2019-07-03 16:24:35.995976014 +0000 ++++ b/include/ar_track_alvar/Marker.h 2019-07-03 16:24:52.396347425 +0000 +@@ -41,6 +41,7 @@ + #include + #include "filter/kinect_filtering.h" + #include ++#include + + namespace alvar { + diff --git a/recipes-ros/ar-track-alvar/ar-track-alvar_0.6.1.bb b/recipes-ros/ar-track-alvar/ar-track-alvar_0.6.1.bb index a1fe0fa..6670b5a 100644 --- a/recipes-ros/ar-track-alvar/ar-track-alvar_0.6.1.bb +++ b/recipes-ros/ar-track-alvar/ar-track-alvar_0.6.1.bb @@ -12,3 +12,5 @@ SRC_URI[sha256sum] = "c34ff4358fb167edccc4357d74425e3370691f04be1f8971f5258aa25d S = "${WORKDIR}/${ROS_SP}" inherit catkin + +SRC_URI += "file://fix.missing.include.patch"