Commit Graph

92470 Commits

Author SHA1 Message Date
Sébastien Loriot 9b60888cb2 fix doc warnings 2020-10-20 13:23:15 +02:00
Sébastien Loriot 5e17e85a80 fix warnings 2020-10-20 09:35:58 +02:00
Laurent Rineau 9e96a45e55
Merge branch 'master' into AABBTreeC++11 2020-10-16 19:01:59 +02:00
Laurent Rineau b4a536047d
Merge pull request #5060 from Vishal19111999/CGAL-Define_CXX20_master-Vishal19111999 2020-10-16 13:56:25 +02:00
Laurent Rineau 5ca3b6fbca Merge branch '5.1.x-branch' 2020-10-16 13:43:26 +02:00
Laurent Rineau 5fa315bb57 Merge pull request #4729 from MaelRL/PMP-Local_stitch_borders-GF
PMP: Add local versions of `stitch_borders` and `stitch_boundary_cycles`
2020-10-16 13:43:13 +02:00
Laurent Rineau 86e1fc18ce Merge pull request #4876 from lrineau/GraphicsView-Basic_viewer_improvements-GF
Improvements to Basic_viewer
2020-10-16 13:43:10 +02:00
Laurent Rineau 5f436061e0 Merge pull request #4942 from theartful/gsoc2020-aos_demo-theartful
GSoC2020 Enhancing the 2D Arrangement Demo
2020-10-16 13:43:08 +02:00
Laurent Rineau f5ce2bdb09 Merge pull request #5057 from maxGimeno/Demo-Fix_scene_scaling-maxGimeno
Polyhedron demo: Fix the scene scaling
2020-10-16 13:43:05 +02:00
Laurent Rineau c6ae44a0fc Merge pull request #5062 from sloriot/Demo-fix_move_border_vertex
Fix move vertex on the boundary
2020-10-16 13:43:03 +02:00
Laurent Rineau 0f92273687 Merge pull request #5064 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron_demo : Fix Edit_box->export_to_facegraph()
2020-10-16 13:43:00 +02:00
Laurent Rineau fe24278512 Merge pull request #5069 from maxGimeno/Demo-Merge_hole_filling_plugins-maxgimeno
Polyhedron_demo: Merge hole_filling and hole_filling_polylines plugins
2020-10-16 13:42:58 +02:00
Laurent Rineau 3383291fd9 Merge pull request #5070 from MaelRL/PMP-Fix_dead_overload_repair_PS-GF
PMP: Remove overload of non-existent function
2020-10-16 13:42:55 +02:00
Laurent Rineau f0288cbeff Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-16 13:41:44 +02:00
Laurent Rineau 51f11605c0 Merge pull request #5022 from janetournois/Intersections_3-fix_do_intersect_3planes-GF
Intersections_3 - fix do_intersect(Plane_3, Plane_3, Plane_3)
2020-10-16 13:41:19 +02:00
Laurent Rineau 1cf1a8435c Merge pull request #5064 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron_demo : Fix Edit_box->export_to_facegraph()
2020-10-16 13:41:16 +02:00
Laurent Rineau a6ab2dedfe Merge pull request #5070 from MaelRL/PMP-Fix_dead_overload_repair_PS-GF
PMP: Remove overload of non-existent function
2020-10-16 13:41:13 +02:00
Laurent Rineau f14aa4490b Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-10-16 13:40:50 +02:00
Laurent Rineau 16064cc99b Merge pull request #5064 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron_demo : Fix Edit_box->export_to_facegraph()
2020-10-16 13:40:28 +02:00
Laurent Rineau f251ab88f4 Merge pull request #5070 from MaelRL/PMP-Fix_dead_overload_repair_PS-GF
PMP: Remove overload of non-existent function
2020-10-16 13:40:25 +02:00
Laurent Rineau 2fd79817db Merge pull request #5070 from MaelRL/PMP-Fix_dead_overload_repair_PS-GF
PMP: Remove overload of non-existent function
2020-10-16 13:39:41 +02:00
Laurent Rineau 95e64ec983 Merge branch 'releases/CGAL-5.0-branch' 2020-10-16 13:24:45 +02:00
Laurent Rineau 5e16d2deaa Merge pull request #5058 from janetournois/Intersections_3-fix_do_intersect_3planes-master-GF
Intersections_3 - fix do_intersect(Plane_3, Plane_3, Plane_3) in master
2020-10-16 13:24:34 +02:00
Laurent Rineau 0f6d4182d4 Merge pull request #5022 from janetournois/Intersections_3-fix_do_intersect_3planes-GF
Intersections_3 - fix do_intersect(Plane_3, Plane_3, Plane_3)
2020-10-16 13:23:23 +02:00
Laurent Rineau f8029d68ba
Merge pull request #5079 from maxGimeno/CI_better_trigger-maxGimeno
CI: Better capture for auto doc build
2020-10-15 13:37:44 +02:00
Maxime Gimeno 80551b1981 Only capture between : and the first whitespace if there is one. Also requires `/build:` instead of `build:` 2020-10-15 13:19:39 +02:00
Laurent Rineau aa527e9ae7 Fix a warning
```
/mnt/testsuite/include/CGAL/draw_face_graph.h:172:16: warning: 'keyPressEvent' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
  virtual void keyPressEvent(QKeyEvent *e)
               ^
/mnt/testsuite/include/CGAL/Qt/Basic_viewer_qt.h:1306:16: note: overridden virtual function is here
  virtual void keyPressEvent(QKeyEvent *e)
               ^
```
2020-10-14 16:28:44 +02:00
Laurent Rineau 24bf8b791a Fix a maybe-uninitialized warning 2020-10-14 14:21:15 +02:00
Laurent Rineau 41ef36a90d Fix a compilation error
```
.../include/CGAL/draw_face_graph.h:116:23: error: ‘is_border’ was not declared in this scope
  116 |         if (!is_border(h, sm))
      |              ~~~~~~~~~^~~~~~~
```
2020-10-14 14:20:46 +02:00
Ahmed Essam ae8496fdfc Probably fixes warnings with Bezier and Rational traits 2020-10-14 07:11:07 +02:00
Maxime Gimeno 32d137fda7 Add missing include 2020-10-13 15:45:33 +02:00
Laurent Rineau 9c97b1dafc Remove trailing whitespaces 2020-10-13 14:34:42 +02:00
Sébastien Loriot 84141fa302 add missing package 2020-10-13 09:26:00 +02:00
Vishal Pratap Singh 0c1c37bf3a
changed [=,this] to [this] 2020-10-12 23:36:23 +05:30
Vishal Pratap Singh f889663188 removed trailing whitespaces 2020-10-10 11:32:24 +05:30
Mael Rouxel-Labbé bdf2473338 Merge remote-tracking branch 'cgal/master' into PMP-Local_stitch_borders-GF 2020-10-09 18:01:09 +02:00
Vishal Pratap Singh f56459a082 removed the changes in box_intersection.h only as it was not in a member function 2020-10-09 21:18:07 +05:30
Laurent Rineau 4db56d82d3 Merge branch '5.1.x-branch' 2020-10-09 17:45:47 +02:00
Laurent Rineau dda9cb605d Merge pull request #5041 from sloriot/PMP-ceres_eigen
Ceres requires Eigen
2020-10-09 17:45:23 +02:00
Laurent Rineau f33e1d22f3 Merge pull request #5048 from sloriot/PMP-repair_less_dep
Remove non-necessary include directives bringing new dependences
2020-10-09 17:45:20 +02:00
Laurent Rineau dba1769280 Merge branch '5.1.x-branch'
# Conflicts:
#	Polygon_mesh_processing/test/Polygon_mesh_processing/remove_degeneracies_test.cpp
2020-10-09 17:41:55 +02:00
Laurent Rineau 8acdb5e4ca Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-09 17:40:44 +02:00
Laurent Rineau 6869e74987 Merge pull request #4995 from sgiraudot/PCA-Fix_Segment_3_variant-GF
PCA: Add validity test and fix several bugs
2020-10-09 17:34:59 +02:00
Laurent Rineau 1633429bdd Merge pull request #5011 from MaelRL/PMP-Repair_degeneracies_fixes-5.0-GF
Degeneracy removal: fix removing upcoming elements while iterating
2020-10-09 17:34:44 +02:00
Laurent Rineau 38c8e40cbb Merge pull request #5012 from MaelRL/PMP-Repair_degeneracies_fixes-5.1-GF
PMP: Degeneracy removal fixes
2020-10-09 17:34:33 +02:00
Laurent Rineau 16f687feb6 Merge pull request #5045 from sloriot/PMP-ps_to_pm_missing_overload
Add missing overload
2020-10-09 17:34:31 +02:00
Laurent Rineau 1f67fcca37 Merge pull request #5051 from maxGimeno/CGAL-Fix_warnings_5_0-maxGimeno
Warnings fixes for 5.0
2020-10-09 17:34:29 +02:00
Laurent Rineau 0b8be6e546 Merge pull request #5052 from maxGimeno/CGAL-Fix_warnings_5_1-maxGimeno
Fixes for warnings in 5.1
2020-10-09 17:34:27 +02:00
Laurent Rineau 6a2e3a4df4 Merge pull request #5056 from maxGimeno/Demo-Fix_compatibility_shaders-maxGImeno
Polyhedron_demo : Fix for compatibility shader
2020-10-09 17:34:24 +02:00
Laurent Rineau 1d59417edc Merge pull request #4995 from sgiraudot/PCA-Fix_Segment_3_variant-GF
PCA: Add validity test and fix several bugs
2020-10-09 17:11:59 +02:00