From 399399d6fe59546e9e7917edf25aefbc2fc64ce0 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 9 Jul 2024 09:39:45 +0200 Subject: [PATCH 1/4] Removing homebrew instructions (to be updated) Removing homebrew instructions --- README.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/README.md b/README.md index 12fe42f8b9..7302be4a9a 100644 --- a/README.md +++ b/README.md @@ -19,23 +19,6 @@ results and potential efficiency of the proposed work. DGtal received the [Symposium on Geometry Processing Software Award in 2016](http://awards.geometryprocessing.org/). -Quick Install -============= - -* MacOS (using [homebrew](http://brew.sh)): - - brew tap DGtal-team/DGtal - brew install dgtal - - -(```brew options dgtal``` to enable optional features) - -* Linux and windows: no binary package, please compile the library. - - -Additional instructions are available in the -[documentation](http://dgtal.org/doc/stable/moduleBuildDGtal.html). - Quick Build Instructions ======================== From 8833c7fcffc04171cb6f76b9a2202bdbcb1b0fdf Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 10 Jul 2024 17:58:36 +0200 Subject: [PATCH 2/4] Cleanup dead documentation. --- src/DGtal/doc/moduleBuildDGtal.dox | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/DGtal/doc/moduleBuildDGtal.dox b/src/DGtal/doc/moduleBuildDGtal.dox index 8043eea5b5..6db79c271a 100644 --- a/src/DGtal/doc/moduleBuildDGtal.dox +++ b/src/DGtal/doc/moduleBuildDGtal.dox @@ -41,12 +41,12 @@ dependencies: To build DGtal in is full configuration, you may need these dependencies too: - \e gmp, +- \e [CGAL](http://cgal.org) (build with Eigen enabled), +- \e [libIGL](https://libigl.github.io), - \e cairo, - \e qglviewer, - \e insighttoolkit (ITK), - \e [HDF5](http://www.hdfgroup.org/HDF5/) -- \e [CGAL](http://cgal.org) (build with Eigen enabled) - If you want to generate the documentation, you would need: - \e doxygen >= 1.8.0, @@ -106,17 +106,6 @@ Then, since recent Mac OS systems are unix-like operating systems, the easiest way to compile DGtal with cmake/make is to follow Linux-based instructions from source code archive. -If you use Homebrew package manager on Mac, -DGtal is available in the package repository: -@code -brew tap DGtal-team/DGtal -brew install dgtal -@endcode -and to get build options: -@code -brew options dgtal -@endcode - \section cmakeDGtal Main DGtal cmake options From 844d8b65be02ff62ba1ff89e48cc723585eebcb3 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 10 Jul 2024 18:04:46 +0200 Subject: [PATCH 3/4] Changelog edit --- ChangeLog.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index bf3410d839..096712ec49 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,15 @@ +# DGtal 1.5beta + +## New features / critical changes + +## Changes +- *General* + - Removing DGtal installation with `homebrew` on mac (the formula being deprecated) (David Coeurjolly, + [#1738](https://github.com/DGtal-team/DGtal/pull/1738)) + +## Bug fixes + + # DGtal 1.4 ## New features / critical changes From e41f6e50b838d657dad9b5196f2edf9dd04c2a71 Mon Sep 17 00:00:00 2001 From: Jacques-Olivier Lachaud Date: Tue, 9 Jul 2024 11:43:26 +0200 Subject: [PATCH 4/4] Fix testClone2 --- tests/base/testClone2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/base/testClone2.cpp b/tests/base/testClone2.cpp index 6bee114f96..7ceec24e17 100644 --- a/tests/base/testClone2.cpp +++ b/tests/base/testClone2.cpp @@ -912,7 +912,7 @@ bool testCloneTimings() double t4 = computeTriangles( size ); trace.info() << "Perimeter is " << t4 << std::endl; ++nb; nbok += Point::nbCreated == Point::nbDeleted ? 1 : 0; - ++nb; nbok += Point::nbCreated < nbC ? 1 : 0; + ++nb; nbok += Point::nbCreated <= nbC ? 1 : 0; trace.info() << "(" << nbok << "/" << nb << ")" << " Point nbCreated=" << Point::nbCreated << " nbDeleted=" << Point::nbDeleted << std::endl;