Update opencv headers

Intermodalics · Jan 4, 2021 · dcc8c40 · dcc8c40
1 parent a870d5f
commit dcc8c40
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/ar_track_alvar/CMakeLists.txt b/ar_track_alvar/CMakeLists.txt
@@ -29,9 +29,13 @@ find_package(OpenCV REQUIRED)
 find_package(TinyXML REQUIRED)
 
 include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-if(COMPILER_SUPPORTS_CXX11)
+
+if(COMPILER_SUPPORTS_CXX14)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+elseif(COMPILER_SUPPORTS_CXX11)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 elseif(COMPILER_SUPPORTS_CXX0X)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

diff --git a/ar_track_alvar/include/ar_track_alvar/FileFormatUtils.h b/ar_track_alvar/include/ar_track_alvar/FileFormatUtils.h
@@ -32,7 +32,7 @@
  */
 
 #include "Alvar.h"
-#include "cv.h"
+#include "opencv2/core/core_c.h"
 #include "tinyxml.h"
 
 namespace alvar {

diff --git a/ar_track_alvar/include/ar_track_alvar/Util.h b/ar_track_alvar/include/ar_track_alvar/Util.h
@@ -37,8 +37,7 @@
 #include <iostream>
 #include <iomanip>
 #include <sstream>
-#include <cxcore.h>
-#include <cv.h>
+#include <opencv2/core.hpp>
 #include <cmath> //for abs
 #include <map>
 #include <opencv2/calib3d/calib3d_c.h> //Compatibility with OpenCV 3.x

diff --git a/ar_track_alvar/src/Marker.cpp b/ar_track_alvar/src/Marker.cpp
@@ -23,7 +23,7 @@
 
 #include "ar_track_alvar/Alvar.h"
 #include "ar_track_alvar/Marker.h"
-#include "highgui.h"
+#include "opencv2/highgui.hpp"
 
 template class ALVAR_EXPORT alvar::MarkerIteratorImpl<alvar::Marker>;
 template class ALVAR_EXPORT alvar::MarkerIteratorImpl<alvar::MarkerData>;

diff --git a/ar_track_alvar/src/Pose.cpp b/ar_track_alvar/src/Pose.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "ar_track_alvar/Pose.h"
+#include "opencv2/core/core_c.h"
 
 using namespace std;
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ @@
      */
     #include "ar_track_alvar/Pose.h"
+    #include "opencv2/core/core_c.h"
     using namespace std;
@@ Expand Down @@