fixed CameraThread compilation error with OpenCV<3, added yaml-cpp dependency to travis

This commit is contained in:
matlabbe
2018-02-02 08:35:06 -05:00
parent 4991d3dbab
commit 61199eff9c
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -14,6 +14,7 @@ addons:
- libopencv-dev - libopencv-dev
- libqt4-dev - libqt4-dev
- libsqlite3-dev - libsqlite3-dev
- libyaml-cpp-dev
install: install:
- sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list' - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list'
+1 -1
View File
@@ -274,7 +274,7 @@ void CameraThread::postUpdate(SensorData * dataPtr, CameraInfo * info) const
if(_stereoExposureCompensation && !data.imageRaw().empty() && !data.rightRaw().empty()) if(_stereoExposureCompensation && !data.imageRaw().empty() && !data.rightRaw().empty())
{ {
#if CV_MAJOR_VERSION < 3 #if CV_MAJOR_VERSION < 3
UWARN("Stereo exposure compensation not implemented for OpenCV version under 3.") UWARN("Stereo exposure compensation not implemented for OpenCV version under 3.");
#else #else
UDEBUG(""); UDEBUG("");
UTimer timer; UTimer timer;