Merge pull request #89 from nilsbore/opencv3_and_python3

Opencv3 and python3
nilsbore · Mar 25, 2022 · ef3f18b · ef3f18b
2 parents 113c7ff + 710fbec
commit ef3f18b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 sudo: required
-dist: xenial
+dist: focal
 compiler:
     - clang
 os:
@@ -14,7 +14,7 @@ before_install:
     #- sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
     - sudo apt-get update
     #- apt list libceres-dev -a
-    - sudo apt-get install -y --allow-unauthenticated libcereal-dev libglfw3-dev libtinyxml2-dev libopencv-dev libboost-all-dev xorg-dev
+    - sudo apt-get install -y --allow-unauthenticated libcereal-dev libopencv-dev libboost-all-dev xorg-dev
 install:
     - git submodule update --init
 script:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -13,10 +13,10 @@ include(GNUInstallDirs)
 
 option(AUVLIB_WITH_GSF "Enable reading and processing gsf data"    ON)
 option(AUVLIB_USE_LIBIGL_EIGEN "Use libigl's version of Eigen"     ON)
-option(AUVLIB_USE_LIBIGL_GLFW "Use libigl's version of glfw"       OFF)
-option(AUVLIB_USE_LIBIGL_TINYXML "Use libigl's version of tinyxml" OFF)
-option(AUVLIB_USE_PYTHON3 "Use python3 instead of python2"         OFF)
-option(AUVLIB_EXPORT_BUILD "Export build dir configs"              ON)
+option(AUVLIB_USE_LIBIGL_GLFW "Use libigl's version of glfw"       ON)
+option(AUVLIB_USE_LIBIGL_TINYXML "Use libigl's version of tinyxml" ON)
+option(AUVLIB_USE_PYTHON3 "Use python3 instead of python2"         ON)
+option(AUVLIB_EXPORT_BUILD "Export build dir configs"              OFF)
 option(AUVLIB_WITH_CERES "Use the ceres library, required for refraction tracing" OFF)
 
 # libigl

diff --git a/src/bathy_maps/src/draw_map.cpp b/src/bathy_maps/src/draw_map.cpp
@@ -142,7 +142,7 @@ void BathyMapImage::draw_track(const mbes_ping::PingsT& pings, const cv::Scalar&
 
     cv::Mat curve(curve_points, true);
     curve.convertTo(curve, CV_32S); //adapt type for polylines
-    cv::polylines(bathy_map, curve, false, color, 1, CV_AA);
+    cv::polylines(bathy_map, curve, false, color, 1, cv::LINE_AA);
 }
 
 void BathyMapImage::draw_track(const vector<Eigen::Vector3d, Eigen::aligned_allocator<Eigen::Vector3d> >& pos)
@@ -162,7 +162,7 @@ void BathyMapImage::draw_track(const vector<Eigen::Vector3d, Eigen::aligned_allo
 
     cv::Mat curve(curve_points, true);
     curve.convertTo(curve, CV_32S); //adapt type for polylines
-    cv::polylines(bathy_map, curve, false, color, 1, CV_AA);
+    cv::polylines(bathy_map, curve, false, color, 1, cv::LINE_AA);
 }
 
 void BathyMapImage::draw_indices(mbes_ping::PingsT& pings, int skip_indices)

diff --git a/src/data_tools/src/benchmark.cpp b/src/data_tools/src/benchmark.cpp
@@ -108,7 +108,7 @@ void track_error_benchmark::draw_track_img(mbes_ping::PingsT& pings, cv::Mat& im
 
     cv::Mat curve(curve_points, true);
     curve.convertTo(curve, CV_32S); //adapt type for polylines
-    cv::polylines(img, curve, false, color, 1, CV_AA);
+    cv::polylines(img, curve, false, color, 1, cv::LINE_AA);
 
     //track_img_path = "track.png";
 }

diff --git a/src/data_tools/src/test_submap_tracks.cpp b/src/data_tools/src/test_submap_tracks.cpp
@@ -117,7 +117,7 @@ int main(int argc, char** argv)
         cv::Scalar color(colormap[i%43][2], colormap[i%43][1], colormap[i%43][0]);
         cv::Mat curve(cp, true);
         curve.convertTo(curve, CV_32S); //adapt type for polylines
-        cv::polylines(track_img, curve, false, color, 2, CV_AA);
+        cv::polylines(track_img, curve, false, color, 2, cv::LINE_AA);
         ++i;
     }