Merge remote-tracking branch 'cgal/5.4.x-branch'

CGAL · May 13, 2022 · 2b547ec · 2b547ec
2 parents 5c45ae9 + 0f90757
commit 2b547ec
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 24 deletions.
diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml
@@ -57,11 +57,11 @@ jobs:
           sudo apt-get update && sudo apt-get install -y graphviz ssh bibtex2html
           sudo pip install lxml
           sudo pip install 'pyquery==1.4.1' # it seems to be the last py2 compatible version
-          wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen/build_1_8_13/bin/doxygen
+          wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~cgaltest/doxygen_1_8_13_patched/doxygen
           sudo mv doxygen_exe /usr/bin/doxygen
           sudo chmod +x /usr/bin/doxygen
-          git config --global user.email "maxime.gimeno@geometryfactory.com"
-          git config --global user.name "Maxime Gimeno"
+          git config --global user.email "cgal@geometryfactory.com"
+          git config --global user.name "cgaltest"
 
       - name: configure all
         if: steps.get_round.outputs.result != 'stop'

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -16,12 +16,12 @@ jobs:
         sudo apt-get update && sudo apt-get install -y graphviz ssh bibtex2html
         sudo pip install lxml 
         sudo pip install 'pyquery==1.4.1' # it seems to be the last py2 compatible version
-        wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen/build_1_8_13/bin/doxygen
+        wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~cgaltest/doxygen_1_8_13_patched/doxygen
         sudo mv doxygen_exe /usr/bin/doxygen
         sudo chmod +x /usr/bin/doxygen
-        git config --global user.email "maxime.gimeno@geometryfactory.com"
-        git config --global user.name "Maxime Gimeno"
-        
+        git config --global user.email "cgal@geometryfactory.com"
+        git config --global user.name "cgaltest"
+
     - name: Run checks
       run: |
         zsh Scripts/developer_scripts/test_merge_of_branch HEAD

diff --git a/.github/workflows/delete_doc.yml b/.github/workflows/delete_doc.yml
@@ -13,8 +13,8 @@ jobs:
     - name: delete directory
       run: |
          set -x
-         git config --global user.email "maxime.gimeno@geometryfactory.com"
-         git config --global user.name "Maxime Gimeno"
+         git config --global user.email "cgal@geometryfactory.com"
+         git config --global user.name "cgaltest"
          git clone https://maxGimeno:${{ secrets.PUSH_TO_CGAL_GITHUB_IO_TOKEN }}@github.com/CGAL/cgal.github.io.git --depth=5
          PR_NUMBER=$(python -c "import json; import os; y = json.load(open(os.environ['GITHUB_EVENT_PATH'])); print(y[\"number\"])")
          cd cgal.github.io/

diff --git a/Convex_hull_3/include/CGAL/Convex_hull_3/dual/predicates.h b/Convex_hull_3/include/CGAL/Convex_hull_3/dual/predicates.h
@@ -70,7 +70,7 @@ namespace CGAL
                 typedef typename K::RT        RT;
                 typedef typename K::Plane_3   Plane_3;
                 typedef typename K::Point_3   Point_3;
-                typedef bool                  result_type;
+                typedef typename K::Boolean   result_type;
 
                 Equal_3_dual_point (Point_3 const& o = Point_3(0, 0, 0)) :
                     origin(o)
@@ -104,7 +104,7 @@ namespace CGAL
                 typedef typename K::RT        RT;
                 typedef typename K::Plane_3   Plane_3;
                 typedef typename K::Point_3   Point_3;
-                typedef bool                  result_type;
+                typedef typename K::Boolean   result_type;
 
                 Collinear_3_dual_point (Point_3 const& o = Point_3(0, 0, 0)) :
                     origin(o)
@@ -151,7 +151,7 @@ namespace CGAL
                 typedef typename K::RT        RT;
                 typedef typename K::Plane_3   Plane_3;
                 typedef typename K::Point_3   Point_3;
-                typedef bool                  result_type;
+                typedef typename K::Boolean   result_type;
 
                 Coplanar_3_dual_point (Point_3 const& o = Point_3(0, 0, 0)) :
                     origin(o)
@@ -200,8 +200,8 @@ namespace CGAL
             {
                 typedef typename K::RT         RT;
                 typedef typename K::Plane_3    Plane_3;
-                typedef typename K::Point_3   Point_3;
-                typedef bool                   result_type;
+                typedef typename K::Point_3    Point_3;
+                typedef typename K::Boolean    result_type;
 
                 Has_on_positive_side_3_dual_point (Point_3 const& o =
                                                    Point_3(0, 0, 0)) :
@@ -263,7 +263,7 @@ namespace CGAL
                 typedef typename K::RT        RT;
                 typedef typename K::Plane_3   Plane_3;
                 typedef typename K::Point_3   Point_3;
-                typedef bool                  result_type;
+                typedef typename K::Boolean   result_type;
 
                 Less_distance_to_point_3_dual_point (Point_3 const& o =
                                                      Point_3(0, 0, 0)) :
@@ -312,8 +312,8 @@ namespace CGAL
             {
                 typedef typename K::RT         RT;
                 typedef typename K::Plane_3    Plane_3;
-                typedef typename K::Point_3   Point_3;
-                typedef bool                   result_type;
+                typedef typename K::Point_3    Point_3;
+                typedef typename K::Boolean    result_type;
 
                 Less_signed_distance_to_plane_3_dual_point (Point_3 const& o =
                                                             Point_3(0, 0, 0)) :
@@ -377,7 +377,7 @@ namespace CGAL
             {
                 typedef typename K::RT         RT;
                 typedef typename K::Plane_3    Plane_3;
-                typedef typename K::Point_3   Point_3;
+                typedef typename K::Point_3    Point_3;
                 typedef CGAL::Oriented_side    result_type;
 
                 Oriented_side_3_dual_point (Point_3 const& o =
@@ -449,4 +449,3 @@ namespace CGAL
 } // namespace CGAL
 
 #endif // CGAL_CH3_DUAL_PREDICATES_H
-
diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h
@@ -3328,8 +3328,8 @@ namespace CommonKernelFunctors {
       return c.rep().has_on_bounded_side(p);
     }
 
-    bool operator()(const Sphere_3& s1, const Sphere_3& s2,
-                    const Point_3& a, const Point_3& b) const
+    result_type operator()(const Sphere_3& s1, const Sphere_3& s2,
+                           const Point_3& a, const Point_3& b) const
     {
       typedef typename K::Circle_3  Circle_3;
       typedef typename K::Point_3   Point_3;

diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
@@ -427,11 +427,14 @@ Scene_polygon_soup_item::orient(std::vector<std::size_t>& non_manifold_vertices)
     const Polygon_soup::Polygons& polygons;
     std::set<std::size_t>& nm_vertices;
     std::set< std::pair<std::size_t, std::size_t> > nm_edges;
+    std::vector<CGAL::IO::Color>& vcolors;
 
     Visitor(const Polygon_soup::Polygons& polygons,
-            std::set<std::size_t>& nm_vertices)
+            std::set<std::size_t>& nm_vertices,
+            std::vector<CGAL::IO::Color>& vcolors)
       : polygons(polygons)
       , nm_vertices(nm_vertices)
+      , vcolors(vcolors)
     {}
 
     void non_manifold_edge(std::size_t v1, std::size_t v2, std::size_t)
@@ -464,6 +467,18 @@ Scene_polygon_soup_item::orient(std::vector<std::size_t>& non_manifold_vertices)
         }
       nm_vertices.insert(v);
     }
+
+    void non_manifold_vertex(std::size_t, std::size_t nb_link_ccs)
+    {
+      if (!vcolors.empty())
+        vcolors.resize(vcolors.size()+nb_link_ccs-1);
+    }
+
+    void vertex_id_in_polygon_replaced(std::size_t, std::size_t input_id, std::size_t new_id)
+    {
+      if (!vcolors.empty())
+        vcolors[new_id]=vcolors[input_id];
+    }
   };
   if(isEmpty() || d->oriented)
     return true; // nothing to do
@@ -492,7 +507,7 @@ Scene_polygon_soup_item::orient(std::vector<std::size_t>& non_manifold_vertices)
 
   bool res;
   std::set<std::size_t> nm_v_set;
-  Visitor visitor(valid_polygons, nm_v_set);
+  Visitor visitor(valid_polygons, nm_v_set, d->soup->vcolors);
   QApplication::setOverrideCursor(Qt::WaitCursor);
   res =  CGAL::Polygon_mesh_processing::
     orient_polygon_soup(d->soup->points, d->soup->polygons, CGAL::parameters::visitor(visitor));

diff --git a/QP_solver/include/CGAL/QP_solver/functors.h b/QP_solver/include/CGAL/QP_solver/functors.h
@@ -254,6 +254,7 @@ class Map_with_default {
     : map(m), d(v)
   {}
 
+#if defined(BOOST_MSVC) && (_MSC_VER < 1920) // 1920 is Visual Studio 2019 version 16.0.0
   // Added as workaround for VC2017 with /arch:AVX to fix
   // https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.14-I-95/QP_solver/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz
   Map_with_default& operator=(const Map_with_default& other)
@@ -262,6 +263,7 @@ class Map_with_default {
     d = other.d;
     return *this;
   }
+#endif
 
   // operator()
   const mapped_type& operator() (key_type n) const {

diff --git a/Shape_regularization/include/CGAL/Shape_regularization/internal/Contour_base_2.h b/Shape_regularization/include/CGAL/Shape_regularization/internal/Contour_base_2.h
@@ -752,7 +752,7 @@ namespace internal {
       const Line_2& line_2,
       Point_2& in_point) const {
 
-      typename std::result_of<Intersect_2(Line_2, Line_2)>::type result
+      typename CGAL::cpp11::result_of<Intersect_2(Line_2, Line_2)>::type result
       = CGAL::intersection(line_1, line_2);
       if (result) {
         if (const Line_2* line = boost::get<Line_2>(&*result)) {