Commit Graph

1964 Commits

Author SHA1 Message Date
Laurent Rineau 73c75212d4 CGAL-4.6 will be released in March 2015
+ update the text file CHANGES
2015-02-19 17:49:36 +01:00
Laurent Rineau bfff3a77a6 Reformat the white-space, to enforce 80 columns 2015-02-19 17:48:44 +01:00
Sébastien Loriot 607929b069 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2015-02-16 11:45:08 +01:00
Laurent Rineau e3de928e26 Fix the release date
+ reindent
+ update CHANGES
2015-02-12 17:32:28 +01:00
Sébastien Loriot 98a4fce6ee update changes 2015-02-12 17:19:29 +01:00
Jane Tournois 0b9169fd65 update changes.html 2015-02-12 17:09:14 +01:00
Andreas Fabri e08c28727c Add #defines to trick moc
(cherry picked from commit 5db9675db8)

Conflicts:
	Installation/include/CGAL/config.h
2015-01-26 16:25:58 +01:00
Laurent Rineau ff62595012 Merge branch 'CGAL-fix_compilation_boost_1_56-lrineau'
Fix compilation issues with Boost-1.56 and later.

Approved by the Release Manager.
2015-01-26 11:42:29 +01:00
Laurent Rineau 87c340fc64 Merge remote-tracking branch 'origin/CGAL_moc_BOOST_JOIN-GF'
Fix the compilation of Qt4 demos, when Boost-1.57 is used.

Approved by the Release Manager.
2015-01-26 11:23:57 +01:00
Andreas Fabri d444701fa0 Add that Kd_tree::begin(0/end() is not in the insertion order 2015-01-20 10:40:10 +01:00
Andreas Fabri 5db9675db8 Add #defines to trick moc 2015-01-19 17:54:26 +01:00
Sébastien Loriot b3f769d486 Merge remote-tracking branch 'origin/Installation-test_tbb_4.3-GF'
Tested in CGAL-4.6-Ic-107
  Approved by the (interim) release manager
2015-01-16 15:41:50 +01:00
Laurent Rineau 59a7f710dd Merge branch 'Spatial_searching-final_acceleration-gf'
Improve the performance of Spatial Searching.

Small features:

  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Spatial_searching_performance_optimization

  https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/spatial_searching_compiletimeD

Approved by the Release Manager

Conflicts:
	Installation/changes.html
2015-01-15 15:31:35 +01:00
Laurent Rineau fd2026a044 Find TBB first with NO_DEFAULT_PATH
With default CMake paths, the TBB installed in /usr/{include/,lib64/} is
found, whatever there is in TBB environment variables. If the search
with NO_DEFAULT_PATH does not find TBB, then the search is made again
with default paths.
2015-01-15 14:39:31 +01:00
Sébastien Loriot b6f5088676 Merge branch 'Scale_space_reconstruction_3-tvanlank'
Tested in CGAL-4.6-Ic-104
   Approved by the release manager
2015-01-14 16:09:11 +01:00
Laurent Rineau d80ee9422a Merge branch 'CGAL-fix_compilation_boost_1_56_4.5-branch-lrineau' into CGAL-fix_compilation_boost_1_56-lrineau
Conflicts:
	Installation/changes.html
2015-01-14 14:49:52 +01:00
Laurent Rineau 5134b29461 Update the changes.html file 2015-01-13 17:30:45 +01:00
Andreas Fabri a92e4101d8 Merge branch 'CGAL_workaround_counting_iterator-GF'
Approved by the release manager
2015-01-12 11:48:10 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Sébastien Loriot 2c961258cb update changes and bibtex file 2015-01-09 14:14:30 +01:00
Sébastien Loriot d2e0dca2f9 update changes 2015-01-09 12:36:07 +01:00
Sébastien Loriot 43e8fae5f8 cosmetic changes 2015-01-09 10:49:26 +01:00
Sébastien Loriot 0218954ea6 Merge branch 'barycentric_coordinates_2-dmitry'
Tested in CGAL-4.6-Ic-99 and CGAL-4.6-Ic-100
  Approved by the release manager

Conflicts:
	Installation/changes.html
	Kernel_23/include/CGAL/internal/Projection_traits_3.h
2015-01-09 10:35:20 +01:00
Andreas Fabri 5adf8e388c Workaround for boost::container::deque; 1 bug fix 2015-01-09 10:23:32 +01:00
Clement Jamin e0b402b094 Merge branch 'Triangulation-higher_dimensions-odevil_shornus'
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Triangulation_d
Tested in CGAL-4.6-Ic-98
Approved by the release manager
2015-01-08 18:15:34 +01:00
Remy Thomasse 02ab5261bc Approved by the Release Manager
Merge branch 'Generators_convex-rthomass'
2015-01-08 15:46:24 +01:00
Sylvain Brandel 9a6ed32a15 Merge branch 'Combinatorial_map-update_attributes-sbrandel'
- corresponding to small feature "Combinatorial map update attributes"
   https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager

Conflicts:
	Installation/changes.html
2015-01-08 14:48:47 +01:00
Laurent Rineau 188ee42012 Restore the executable bit of all scripts 2015-01-07 17:54:56 +01:00
Sylvain Brandel 92681aae83 added changes in Installation/changes.html 2015-01-07 16:21:16 +01:00
Remy Thomasse f85647f666 changes.html 2015-01-06 17:04:30 +01:00
Dmitry Anisimov 8e4a486024 Updated file changes.html. 2014-12-29 16:40:15 +01:00
Dmitry Anisimov 7d9f7bcf9c Test update and modification of the file changes.html. 2014-12-29 16:16:30 +01:00
Andreas Fabri 476fadca6a Add Surface_mesh to changes.html 2014-12-22 18:05:42 +01:00
Laurent Rineau e6f1aaa801 Fix the HTML in changes.html 2014-12-22 16:50:03 +01:00
Andreas Fabri 6b54e74af5 fix opy paste error 2014-12-20 16:15:08 +01:00
Andreas Fabri 30faf6241b Add wrappers around 2 boost headers to push/pop pragma 2014-12-19 16:10:02 +01:00
Andreas Fabri b85f97593a Add entry in changes.html 2014-12-19 14:43:08 +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
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
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
Sébastien Loriot 79d2f2383c update changes 2014-12-16 11:52:59 +01:00
Jane Tournois f3ab2cf92d Merge branch 'to-be-tested/Triangulation_3-determinism-gf'
make Triangulation_3 deterministic from platform to platform
on degenerate cases

Approved by the release manager
2014-12-15 14:01:45 +01:00
Jane Tournois 6b6af12353 fix the BOOST_JOIN parse error in demos
somehow, boost/random.hpp includes boost/type_traits/has_binary_operator.hpp,
and the "parse error" happens in this file (as said in the bug report)

Also update the link to the official Qt bug report
2014-12-11 12:17:44 +01:00
m.overtheil e7fa0e396d Updated changes.html 2014-12-11 10:13:07 +01:00
Sébastien Loriot 3972130053 update changes.html 2014-12-11 08:50:21 +01:00
m.overtheil 9da9cff768 Merge branch 'Spatial_searching-Rectangle_compiletimeD-gf' into Spatial_searching-final_acceleration-gf
Conflicts:
	Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
	Spatial_searching/include/CGAL/Kd_tree.h
	Spatial_searching/include/CGAL/Kd_tree_node.h
2014-11-28 13:10:08 +01:00
m.overtheil 5b67887a5e Merge branch 'Spatial_searching-Sliding_Midpoint_Splitter_bugfix-gf' into Spatial_searching-final_acceleration-gf 2014-11-28 12:43:12 +01:00
Laurent Rineau 09da20c021 Merge branch 'Mesh_3-fix_integer_overflow-jtournoi'
this branch fixes Image_IO for large images, when the
dimensions do not fit in 'unsigned int'
'size_t' is now used everywhere that deals with image sizes
and pixel/voxel coordinates

fix suggested by a CGAL user

Tested in CGAL-4.6-Ic-64.
Approved by the Release Manager.
2014-11-28 12:33:40 +01:00
Laurent Rineau 8231a36e89 Add Boost_DEBUG as an advanced OPTION 2014-11-28 12:09:14 +01:00