Fix build issue on ci

lagadic · Jun 25, 2024 · f1b79a1 · f1b79a1
1 parent c78dfca
commit f1b79a1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/modules/core/include/visp3/core/vpImageTools_warp.h b/modules/core/include/visp3/core/vpImageTools_warp.h
@@ -35,6 +35,7 @@
 #define VP_IMAGE_TOOLS_WARP_H
 
 // Warning: this file shouldn't be included by the user. Internal usage only to reduce length of vpImage.h
+#include <visp3/core/vpImageTools.h>
 
 /*!
   Apply a warping (affine or perspective) transformation to an image.

diff --git a/modules/core/test/camera/testJsonCamera.cpp b/modules/core/test/camera/testJsonCamera.cpp
@@ -72,8 +72,8 @@ class vpRandomCamGenerator : public Catch::Generators::IGenerator<vpCameraParame
     static_cast<void>(next());
   }
 
-  const vpCameraParameters &get() const vp_override { return current; }
-  bool next() vp_override
+  const vpCameraParameters &get() const VP_OVERRIDE { return current; }
+  bool next() VP_OVERRIDE
   {
     const double px = m_dist(m_rand);
     const double py = m_dist(m_rand);

diff --git a/modules/core/test/math/testJsonArrayConversion.cpp b/modules/core/test/math/testJsonArrayConversion.cpp
@@ -68,12 +68,12 @@ class vpExceptionMatcher : public Catch::Matchers::Impl::MatcherBase<vpException
     : m_type(type), m_messageMatcher(messageMatcher)
   { }
 
-  bool match(vpException const &in) const vp_override
+  bool match(vpException const &in) const VP_OVERRIDE
   {
     return m_type == in.getCode() && m_messageMatcher.match(in.getStringMessage());
   }
 
-  std::string describe() const vp_override
+  std::string describe() const VP_OVERRIDE
   {
     std::ostringstream ss;
     ss << "vpException has type " << m_type << " and message " << m_messageMatcher.describe();
@@ -98,8 +98,8 @@ class vpRandomArray2DGenerator : public Catch::Generators::IGenerator<vpArray2D<
     static_cast<void>(next());
   }
 
-  vpArray2D<double> const &get() const vp_override { return current; }
-  bool next() vp_override
+  vpArray2D<double> const &get() const VP_OVERRIDE { return current; }
+  bool next() VP_OVERRIDE
   {
     const unsigned nCols = m_dim_dist(m_rand);
     const unsigned nRows = m_dim_dist(m_rand);
@@ -129,8 +129,8 @@ class vpRandomColVectorGenerator : public Catch::Generators::IGenerator<vpColVec
     static_cast<void>(next());
   }
 
-  const vpColVector &get() const vp_override { return current; }
-  bool next() vp_override
+  const vpColVector &get() const VP_OVERRIDE { return current; }
+  bool next() VP_OVERRIDE
   {
     const unsigned nRows = m_dim_dist(m_rand);
     current.resize(nRows);

diff --git a/modules/tracker/me/test/testJsonMe.cpp b/modules/tracker/me/test/testJsonMe.cpp
@@ -104,8 +104,8 @@ class RandomMeGenerator : public Catch::Generators::IGenerator<vpMe>
     static_cast<void>(next());
   }
 
-  vpMe const &get() const vp_override { return current; }
-  bool next() vp_override
+  vpMe const &get() const VP_OVERRIDE { return current; }
+  bool next() VP_OVERRIDE
   {
     current.setThreshold(m_dist(m_rand) * 255);
     current.setMaskNumber(m_int_dist(m_rand) * 10);