Merge pull request #1674 from dcoeurjo/BenchOptionFix

Removing WITH_BENCHMARK
DGtal-team · Jan 6, 2023 · d9e544e · d9e544e
2 parents b0df45d + ab4f8a9
commit d9e544e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,12 @@
 - *General*
   - Fix of couple of doxygen warnings that cause errors on Github Actions
     CI bots. (David Coeurjolly, [#1672](https://github.com/DGtal-team/DGtal/pull/1672))
+  - Removing "WITH_BENCHMARK" option as Google Benchmark is already included when building
+    the unit tests. (David Coeurjolly, [#1674](https://github.com/DGtal-team/DGtal/pull/1674))
+
+- *IO*
+  - Fix of the `getHSV` method in the `Color` class. (David Coeurjolly,
+    [#1674](https://github.com/DGtal-team/DGtal/pull/1674))
 
 # DGtal 1.3
 

diff --git a/cmake/CheckDGtalOptionalDependencies.cmake b/cmake/CheckDGtalOptionalDependencies.cmake
@@ -20,7 +20,6 @@ option(WITH_CAIRO "With CairoGraphics." OFF)
 option(WITH_HDF5 "With HDF5." OFF)
 option(WITH_QGLVIEWER "With LibQGLViewer for 3D visualization (Qt5 required)." OFF)
 option(WITH_PATATE "With Patate library for geometry OFF (Eigen required)." processing)
-option(WITH_BENCHMARK "With Google Benchmark." OFF)
 option(WITH_FFTW3 "With FFTW3 discrete Fourier Transform library." OFF)
 
 #----------------------------------

diff --git a/src/DGtal/helpers/ShortcutsGeometry.h b/src/DGtal/helpers/ShortcutsGeometry.h
@@ -1375,7 +1375,7 @@ namespace DGtal
       /// Given any digital \a surface, a surfel range \a surfels, and an input vector field \a input,
       /// returns a piece-smooth approximation of \a input using Ambrosio-Tortorelli functional.
       ///
-      /// @see \ref moduleAT
+      /// @see \ref moduleGenericAT
       ///
       /// @tparam TAnyDigitalSurface either kind of DigitalSurface, like ShortcutsGeometry::LightDigitalSurface or ShortcutsGeometry::DigitalSurface.
       /// @tparam VectorFieldInput the type of vector field for input values (RandomAccess container)
@@ -1430,7 +1430,7 @@ namespace DGtal
       /// also outputs the feature vector \a features, corresponding to
       /// 0-form \a v in AT (the average of \a v for linels/surfels).
       ///
-      /// @see \ref moduleAT
+      /// @see \ref moduleGenericAT
       ///
       /// @tparam TAnyDigitalSurface either kind of DigitalSurface, like ShortcutsGeometry::LightDigitalSurface or ShortcutsGeometry::DigitalSurface.
       /// @tparam VectorFieldInput the type of vector field for input values (RandomAccess container)
@@ -1498,7 +1498,7 @@ namespace DGtal
       /// approximation of \a input using Ambrosio-Tortorelli
       /// functional.
       ///
-      /// @see \ref moduleAT
+      /// @see \ref moduleGenericAT
       ///
       /// @tparam TAnyDigitalSurface either kind of DigitalSurface, like ShortcutsGeometry::LightDigitalSurface or ShortcutsGeometry::DigitalSurface.
       ///
@@ -1553,7 +1553,7 @@ namespace DGtal
       /// corresponding to 0-form \a v in AT (the average of \a v for
       /// linels/surfels).
       ///
-      /// @see \ref moduleAT
+      /// @see \ref moduleGenericAT
       ///
       /// @tparam TAnyDigitalSurface either kind of DigitalSurface, like ShortcutsGeometry::LightDigitalSurface or ShortcutsGeometry::DigitalSurface.
       /// @tparam CellRangeConstIterator the type of iterator for traversing a range of cells
@@ -1822,4 +1822,3 @@ namespace DGtal
 
 #undef ShortcutsGeometry_RECURSES
 #endif // else defined(ShortcutsGeometry_RECURSES)
-
diff --git a/src/DGtal/io/Color.h b/src/DGtal/io/Color.h
@@ -192,7 +192,7 @@ namespace DGtal
     std::array<double, 3> getHSV() const
     {
       double h,s,v;
-      Color::RGBtoHSV(h,s,v, this->r(), this->g(), this->b());
+      Color::RGBtoHSV(h,s,v, this->red(), this->green(), this->blue());
       return {h,s,v};
     }
 

diff --git a/wrap/tests/azure-pipelines.yml b/wrap/tests/azure-pipelines.yml
@@ -118,6 +118,6 @@ stages:
         cmake --build "$(Build.SourcesDirectory)\build"
       workingDirectory: '$(Build.SourcesDirectory)'
       displayName: 'Build project'
-    - script: ctest -R python -V
+    - script: ctest -R python -V --rerun-failed --output-on-failure
       workingDirectory: '$(Build.SourcesDirectory)\build'
       displayName: 'CTest'
diff --git a/wrap/tests/kernel/test_PointVector.py b/wrap/tests/kernel/test_PointVector.py
@@ -207,7 +207,7 @@ def test_bridge_buffer(Self):
     ps = Self()
     ps[0] = 2
     ps[1] = 4
-    dtype = getattr(np, ps.dtype)
+    dtype = ps.dtype
     if ps.dimension == 2:
         expected_np_array = np.array([ps[0], ps[1]], dtype=dtype)
     elif ps.dimension == 3: