Commit Graph

140 Commits

Author SHA1 Message Date
Laurent Rineau 057924e1d4 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch'
That merges the following:
  | commit 5dbfeec3ae
  | Merge: fc407cf 5b9be0f
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Fri Dec 12 15:29:51 2014 +0100
  |
  |     Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
  |
  |     Tested in CGAL-4.5.1-Ic-171
  |
  | commit fc407cfebf
  | Merge: bd2c6f8 0c6153c
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Mon Dec 1 17:38:48 2014 +0100
  |
  |     Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch
  |
  |     Bug-fix in Mesh_3 with time stamps.
  |
  |     Tested in CGAL-4.5.1-Ic-168.
  |     Approved by the Release Manager.
  |
  | commit bd2c6f890f
  | Merge: ad53e42 c904f77
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:04:55 2014 +0100
  |
  |     Merge branch BGL-make_property_map_lightweight-For_4.5_bugfix-GF' into releases/CGAL-4.5-branch
  |
  |     Bug fix: a property map was not lightweight.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit ad53e42fb3
  | Merge: 044660e b281d86
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:03:30 2014 +0100
  |
  |     Merge remote-tracking branch 'remotes/origin/BGL-fix_example-GF' into releases/CGAL-4.5-branch
  |
  |     Fix the example examples/BGL_triangulation_2/emst.cpp:
  |     the filtered (finite) triangulation was not used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit 044660eb48
  | Merge: a096cdf 4464116
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:01:50 2014 +0100
  |
  |     Merge branch 'CGAL-fix_sse2_mingw-lrineau' into releases/CGAL-4.5-branch
  |
  |     Fix the SSE macros when MinGW is used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.

Tested in CGAL-4.6-Ic-79.
2014-12-17 17:05:01 +01:00
Sébastien Loriot 12a9027ed9 Merge remote-tracking branch 'origin/BG-split_graph_into_polylines-GF'
The extract polyhedron boundary now extract maximal polylines from
  the set of boundary edges. End point are vertices of degree != 2
  For convenience the function used to build these maximal polylines
  is put into include/CGAL/boost/graph/split_graph_into_polylines.h

Tested in 4.6-Ic-76
Approved by the release manager
2014-12-16 11:40:11 +01:00
Andreas Fabri 1606841d22 wording in a comment 2014-12-03 17:04:30 +01:00
Andreas Fabri 6e8a9a6432 remove trailing whitespace 2014-12-03 11:48:44 +01:00
Andreas Fabri 4a20dded24 Only copy vertices which are not isolated 2014-12-03 09:30:52 +01:00
Andreas Fabri 11a5ffd5ed isolated vertices may have degree==0 in the assertion 2014-12-03 09:30:52 +01:00
Sébastien Loriot bba0e8ce05 remove warning 2014-12-02 19:52:38 +01:00
Andreas Fabri 10a5d629aa fix type 2014-12-02 17:50:13 +01:00
Andreas Fabri 3df4841b83 fix type 2014-12-02 17:07:02 +01:00
Andreas Fabri eaf7214844 The split function takes care of parallel edges and self loops 2014-12-02 16:11:11 +01:00
Andreas Fabri c904f77e13 Use a shared_ptr in order to make the property map lightweight 2014-11-21 12:50:35 +01:00
Andreas Fabri c943497763 Add split_graph_into_polylines and example 2014-11-03 13:07:50 +01:00
Andreas Fabri d91f2deaff safisfies_link_condition() -> satisfies_link_condition() in code/doc/test
Add doxygen for collapse_edge() with an EdgeIsConstrainedMap
2014-10-21 10:17:34 +02:00
Sébastien Loriot f87046546e remove duplicated class with name clashing with a macro in X11/X.h 2014-09-30 11:11:19 +02:00
Sébastien Loriot 494f558a7a Merge branch 'BGL-fix_split_edge-local'
Tested in CGAL-4.5-Ic-106

Approved by the release manager (interim)
2014-07-28 09:13:49 +02:00
Sébastien Loriot ba8fd0d603 fix typo
trivial bugfix for master
2014-07-28 09:10:13 +02:00
Andreas Fabri 8d7cc0cf6f fixes in the doxygen comments
Approved by the release manager
2014-07-27 17:48:01 +02:00
Sébastien Loriot 2b6fa0076a Merge branch 'BGL-fix_halfedge_edge_is_border_pmap-sloriot'
Tested in CGAL-4.5-Ic-105

Approved by the (interim) release manager
2014-07-24 20:41:06 +02:00
Sébastien Loriot f7cad6db65 bug in the doc of Polyhedron_3::split_edge inducing a bug in Euler::split_edge 2014-07-24 13:26:36 +02:00
Sébastien Loriot 483ff9acb1 fix warning
trivial bugfix for master
2014-07-24 10:08:36 +02:00
Sébastien Loriot d77d9797e4 fix unused variable warnings
trivial bugfix for master
2014-07-23 08:53:15 +02:00
Sébastien Loriot cdec3d6414 make the edge_descriptor of Polyhedron hashable 2014-07-23 08:20:16 +02:00
Sébastien Loriot 5c6b54257a the XXX_is_border properties are removed + add missing replacement functions 2014-07-22 12:00:15 +02:00
Sébastien Loriot 0b8314e28d the notion of border for a halfedge is not encoded using a property map 2014-07-21 22:30:14 +02:00
Sébastien Loriot bc8e1f399d workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation 2014-07-19 12:20:29 +02:00
Sébastien Loriot 5fce0d89f2 remove non-needed conversion operator (because of inheritance)
trivial bug-fix for master
2014-07-09 23:54:52 +02:00
Sébastien Loriot 1d1c99d2f6 remove a file copied from boost that is not used 2014-07-04 17:24:06 +02:00
Sébastien Loriot 0a5a986fbd prefix macros with CGAL_ 2014-07-04 17:24:06 +02:00
Sébastien Loriot 65a176d0e7 update license 2014-07-04 17:24:06 +02:00
Sébastien Loriot ec9c796552 remove exe flag 2014-07-04 17:24:06 +02:00
Sébastien Loriot 5f4813b64d properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h 2014-07-04 17:24:05 +02:00
Sébastien Loriot 947fa97639 remove non-needed include directive 2014-07-04 11:14:31 +02:00
Sébastien Loriot f3dd6472e6 fix typos
(cherry picked from commit 5ed924261c)
2014-07-03 12:27:30 +02:00
Sébastien Loriot 64a893c8fc remove warning about a unused type in release mode 2014-07-03 11:04:08 +02:00
Andreas Fabri 6546468092 polish doc 2014-07-02 17:43:01 +02:00
Andreas Fabri f08a65d914 cleanup 2014-07-02 17:42:37 +02:00
Andreas Fabri 3bd0fb9c86 Add bool verbose to is_valid(G) 2014-07-02 12:55:32 +02:00
Andreas Fabri 80c8fec9e2 Add test and fixes of add_vertex_and_face_to_border 2014-07-02 12:55:32 +02:00
Sébastien Loriot 589144aff8 add assertions to prevent using a default initialized property map 2014-07-02 10:42:55 +02:00
Andreas Fabri e0eafe352c add the code of add_vertex_and_face_to_border 2014-07-01 14:33:09 +02:00
Andreas Fabri 56825335fa include CGAL/property_map.h instead of rhe boost file 2014-06-29 16:41:46 +02:00
Andreas Fabri b301c88982 polish 2014-06-27 17:37:08 +02:00
Andreas Fabri 8f4e02a39a last png -> svg 2014-06-27 16:16:35 +02:00
Andreas Fabri d11cac3e94 remove unused typedefs 2014-06-27 15:11:39 +02:00
Andreas Fabri 3252e8557f add missing typename 2014-06-27 12:50:24 +02:00
Andreas Fabri f7dd91c556 png -> svg 2014-06-27 12:49:51 +02:00
Andreas Fabri 25ae87571b fix openmesh testsuite 2014-06-26 23:25:18 +02:00
Andreas Fabri 11b078a969 png -> svg 2014-06-26 23:25:17 +02:00
Sébastien Loriot 3ff711c799 handle properties of const Polyhedron 2014-06-24 16:36:18 +02:00
Andreas Fabri 99f082bd2e first svgs replacing pngs 2014-06-20 13:47:07 +02:00