i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-03 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed build errors with OpenCV2 caused by commit 39e1d45369 (OpenCV4)

Browse Source
This commit is contained in:
matlabbe
2018-10-21 13:53:49 -04:00
parent 39e1d45369
commit 93a3a667c8
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corelib/src/camera/CameraOpenNICV.cpp
View File

@@ -26,7 +26,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/core/camera/CameraOpenNICV.h> #include <rtabmap/core/camera/CameraOpenNICV.h>
#include <rtabmap/utilite/UTimer.h> #include <rtabmap/utilite/UTimer.h>
#if CV_MAJOR_VERSION > 3
#include <opencv2/videoio/videoio_c.h> #include <opencv2/videoio/videoio_c.h>
#endif
namespace rtabmap namespace rtabmap
{ {

4
corelib/src/camera/CameraStereoVideo.cpp
View File

@@ -28,8 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/core/camera/CameraStereoVideo.h> #include <rtabmap/core/camera/CameraStereoVideo.h>
#include <rtabmap/utilite/UTimer.h> #include <rtabmap/utilite/UTimer.h>
#include <rtabmap/utilite/UConversion.h> #include <rtabmap/utilite/UConversion.h>
#include <opencv2/videoio/videoio_c.h>
#include <opencv2/imgproc/types_c.h> #include <opencv2/imgproc/types_c.h>
#if CV_MAJOR_VERSION > 3
#include <opencv2/videoio/videoio_c.h>
#endif
namespace rtabmap namespace rtabmap
{ {

2
corelib/src/camera/CameraVideo.cpp
View File

@@ -28,7 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/core/camera/CameraVideo.h> #include <rtabmap/core/camera/CameraVideo.h>
#include <rtabmap/utilite/UTimer.h> #include <rtabmap/utilite/UTimer.h>
#include <rtabmap/utilite/UConversion.h> #include <rtabmap/utilite/UConversion.h>
#if CV_MAJOR_VERSION > 3
#include <opencv2/videoio/videoio_c.h> #include <opencv2/videoio/videoio_c.h>
#endif
namespace rtabmap namespace rtabmap
{ {