From b0a06838b999cac23350a1678d002a5b25fcf35e Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Jan 2023 10:58:15 +0100 Subject: [PATCH 1/6] Removing WITH_BENCHMARK --- ChangeLog.md | 2 ++ cmake/CheckDGtalOptionalDependencies.cmake | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 97de2a81c2..304017cbba 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,6 +9,8 @@ - *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, [#16xx](https://github.com/DGtal-team/DGtal/pull/16xx)) # DGtal 1.3 diff --git a/cmake/CheckDGtalOptionalDependencies.cmake b/cmake/CheckDGtalOptionalDependencies.cmake index 96f963b565..caac239b2a 100644 --- 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) #---------------------------------- From e1269b3fa6540fe00d1aa531440d5b8d0d3e0db7 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Jan 2023 11:02:50 +0100 Subject: [PATCH 2/6] Changelog update --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 304017cbba..6cc92c3a4b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -10,7 +10,7 @@ - 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, [#16xx](https://github.com/DGtal-team/DGtal/pull/16xx)) + the unit tests. (David Coeurjolly, [#1674](https://github.com/DGtal-team/DGtal/pull/1674)) # DGtal 1.3 From d5f8e2f4519c14e326960430c7cc629275b95a82 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Jan 2023 13:06:42 +0100 Subject: [PATCH 3/6] python tests --- wrap/tests/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrap/tests/azure-pipelines.yml b/wrap/tests/azure-pipelines.yml index a79403a857..134ca1d44b 100644 --- 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' From 8206f13d36cbf5cc4ee594c74f341cbf99285a4b Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Jan 2023 08:48:16 +0100 Subject: [PATCH 4/6] numpy fix --- wrap/tests/kernel/test_PointVector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrap/tests/kernel/test_PointVector.py b/wrap/tests/kernel/test_PointVector.py index 26a3d9ad35..96b43dfb39 100644 --- 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: From d5bb865c061e0030508026f7496e48e86bc1e0c0 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Jan 2023 09:03:35 +0100 Subject: [PATCH 5/6] Fixing bug in Color --- ChangeLog.md | 4 ++++ src/DGtal/io/Color.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 6cc92c3a4b..16eeaa9962 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -12,6 +12,10 @@ - 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 ## New features / critical changes diff --git a/src/DGtal/io/Color.h b/src/DGtal/io/Color.h index 6f4d1ba4a9..a3d9a29345 100644 --- a/src/DGtal/io/Color.h +++ b/src/DGtal/io/Color.h @@ -192,7 +192,7 @@ namespace DGtal std::array 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}; } From ffdd565568c6c22610c445d0d96844e9198d947b Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Jan 2023 09:13:33 +0100 Subject: [PATCH 6/6] doxygen fix --- src/DGtal/helpers/ShortcutsGeometry.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/DGtal/helpers/ShortcutsGeometry.h b/src/DGtal/helpers/ShortcutsGeometry.h index 866065ce1e..c42710a352 100644 --- 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) -