songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
58,654 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

58654 Commits

Author SHA1 Message Date
Jane Tournois 175c4b321e Merge branch 'releases/CGAL-4.5-branch' 
Approved by the release manager
 2014-12-19 11:31:32 +01:00
Shihao Wu e6b640528a use sphere_20k for WLOP's example 2014-12-19 18:29:56 +08:00
Shihao Wu d2af2f3677 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2014-12-19 18:26:24 +08:00
Shihao Wu 978f9602e3 use sphere_20k for example for WLOP 2014-12-19 18:26:06 +08:00
Jane Tournois 0ee08ef100 Merge branch 'Mesh_3-fix_compilation_with_tbb43-GF' into releases/CGAL-4.5-branch 
fix the compilation of Mesh_3 for TBB 4.3

Approved by the release manager
 2014-12-19 11:19:32 +01:00
Andreas Fabri 18b5b312f9 do not use the boost testing framework 2014-12-18 20:32:50 +01:00
Laurent Rineau 4a7929c611 Fix license header: should be LGPLv3+ 2014-12-18 16:51:32 +01:00
Laurent Rineau 4a8e911e38 Minor fixes 2014-12-18 16:48:44 +01:00
Clement Jamin 7a06a08ca4 Update doc to state that ICC prior to version 15 is not supported for Epick_d 
Approved by the Release Manager
 2014-12-18 12:42:34 +01:00
Laurent Rineau 350a95b7e6 Fix the license header of a file 2014-12-18 11:31:23 +01:00
Clement Jamin 81f68efb7e Oops. This fixes the previous bug fix (wrong place). 2014-12-18 11:00:12 +01:00
Clement Jamin 6694b8adfb Bugfix: we can't call infinite_vertex() like this 2014-12-18 10:56:09 +01:00
Clement Jamin 315ffdcbc8 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-12-18 09:32:23 +01:00
Sébastien Loriot 7e0b5a3fe6 skip comments while reading off files 2014-12-18 08:42:49 +01:00
Andreas Fabri e3ba8201c7 unify variable names 2014-12-18 08:26:06 +01:00
Andreas Fabri e0007b0564 remove free functions for proprty handling s this is not mature yet 2014-12-18 08:26:03 +01:00
Andreas Fabri 2ccc5e5b59 clean up example of face_graph.cpp 2014-12-18 08:26:00 +01:00
Andreas Fabri 9f6807b005 Add Tds_2::collapse_edge() 2014-12-18 08:25:57 +01:00
Sébastien Loriot 5c135e0d30 fix bool for add_property 2014-12-18 08:11:08 +01:00
Sébastien Loriot d6c901d6b1 update doc after moving example to benchmark 2014-12-17 22:40:17 +01:00
Sébastien Loriot ce6342d629 Merge remote-tracking branch 'origin/Stream_support-fix_reading_double-GF' 
improve reading double from streams on windows

Tested in CGAL-4.6-Ic-79
Approved by the release manager
 2014-12-17 22:36:46 +01:00
Sébastien Loriot bec6d95bd0 fix warning 2014-12-17 22:33:37 +01:00
Andreas Fabri 8f23d8d07d remove doc_tex; chmod -x fig 2014-12-17 22:29:22 +01:00
Sébastien Loriot 75108a0f93 shorten example name to please cmake 2014-12-17 22:26:30 +01:00
Laurent Rineau 515ff77960 Merge branch 'Surface_mesher-fix_a_warning-lrineau' 
Fix a warning.

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 17:10:37 +01:00
Laurent Rineau 602383e15b Merge branch 'Mesh_3-fix_Implicit_mesh_domain_3_default_bound-lrineau' 
Bug fix in Mesh_3

Approved by the Release Manager. Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:09:20 +01:00
Laurent Rineau c043a0dca9 Merge branch 'Installation-Boost_DEBUG-lrineau' 
Add Boost_DEBUG as a CMake advanced option.
 2014-12-17 17:08:43 +01:00
Laurent Rineau 9debd6a471 Merge branch 'CGAL-various_fixes-lrineau' 
s/const static/static const/

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 17:07:57 +01:00
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
Laurent Rineau 2a69e0f0c2 Merge branch 'GraphicsView-try_export_to_SVG-lrineau' 
New function DemosMainWindow::exportSVG

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
 2014-12-17 16:59:55 +01:00
Clement Jamin 2cb94870d3 Forgot to remove this sentence 2014-12-17 16:15:06 +01:00
Clement Jamin 609143bbf4 Make a copy of "points" for the second run 2014-12-17 14:59:23 +01:00
Guillaume Damiand 936338896f Merge branch 'Kernel_23-const-bugfix-gdamiand' 
Add const for TRANSLATION, ROTATION, SCALING, REFLECTION, IDENTITY variables.

Tested in CGAL-4.6-Ic-79.
Approved by the release manager.
 2014-12-17 14:53:42 +01:00
Clement Jamin 785f2fda7e Concurrency should be OFF by default 2014-12-17 14:46:36 +01:00
Marc Glisse ae4084948e Remove hack for Intel compiler: it didn't work, and version 15 fixed the bug. 2014-12-17 12:25:30 +01:00
Andreas Fabri 6a00be2602 disable warning with push/pop macros around boost header 2014-12-16 17:25:33 +01:00
Andreas Fabri a77205a33c disable warning with push/pop macros around boost header 2014-12-16 17:13:30 +01:00
Clement Jamin f6971fbed3 Doc clean-up: remove \cgalModifXXX 2014-12-16 17:05:24 +01:00
Jane Tournois 90a74c1bb6 fix a bug that happens on vc10, because atomics are not initialized 2014-12-16 16:42:22 +01:00
Laurent Rineau 58d504f744 The demo are collected on MSVC2012-Release-32bits 2014-12-16 16:31:10 +01:00
Andreas Fabri be5cf9eb5a put a unused variable in assertion code 2014-12-16 16:16:50 +01:00
Sébastien Loriot 375db1ccc3 protect max function 2014-12-16 15:55:22 +01:00
Sébastien Loriot a9bca7522d std::isnan and std::isinf are c++11 functions 2014-12-16 15:53:46 +01:00
Sébastien Loriot a7451e1e8c use ATTENTION instead of WARNING in message to avoid confusing the testsuite 2014-12-16 15:45:06 +01:00
Jane Tournois 88142b2997 fix compilation for TBB 4.3 
this partial specialization was only used for testing, so it can be removed
The problem comes from the std::vector of mutex(s), which can't be copied
using the std::vector operator=
 2014-12-16 13:02:39 +01:00
Sébastien Loriot 79d2f2383c update changes 2014-12-16 11:52:59 +01:00
Sébastien Loriot cecd1464d9 Merge remote-tracking branch 'gsoc/gsoc2014-Convex_hull_3_dual-jmeyron' 
Add functions to compute the finite intersection of halfspaces
  See Features/Small_Features/Halfspace_intersection

Tested in 4.6-Ic-76
Approved by the release manager
 2014-12-16 11:44:55 +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
Sébastien Loriot 1cf3c2fe91 cosmetic 2014-12-16 11:06:48 +01:00
Sébastien Loriot 9bc80b47f2 reduce the number of points to add to speed up the runtime 2014-12-16 10:57:00 +01:00