Commit Graph

57210 Commits

Author SHA1 Message Date
Sébastien Loriot 98a4fce6ee update changes 2015-02-12 17:19:29 +01:00
Jane Tournois a4d0ae7b8d Merge branch 'Mesh_3-debug_hole_perturber_4.5-jtournoi' into releases/CGAL-4.5-branch
this branch fixes a bug in sliver perturbation
revert_move uses a backup system that needs to backup also infinite cells.
It was not the case until now and could produce holes on the surface,
though cells of the C3t3 were correctly tagged.

note this branch also fixes a warning in Implicit_to_labeling_function_wrapper,
which has nothing to do with the previous bug

Approved by the release manager
2015-02-12 17:14:29 +01:00
Jane Tournois 0b9169fd65 update changes.html 2015-02-12 17:09:14 +01:00
Jane Tournois f4af27a3da reorder variables for initialization 2015-02-06 10:01:41 +01:00
Jane Tournois abfc6d92c8 fix a warning caused by boost::dynamic_bitset<> 2015-02-03 11:20:01 +01:00
Jane Tournois 21082320e3 minimize changes to get warnings, but dynamic_bitset triggers a warning 2015-02-03 11:05:29 +01:00
Jane Tournois a923ae477d fix conversion warnings. meshing_info() is an int here 2015-02-03 10:25:43 +01:00
Jane Tournois b03a656246 this becomes useless because we now backup infinite cells 2015-02-02 15:55:28 +01:00
Jane Tournois c57b9b8840 backup infinite cells for revert_move of perturber
this is necessary because there can be an infinite cells
among the outdated_cells (with a finite facet f)
that does not share any finite facet with the other cells of
the conflict zone/set of outdated cells.

Therefore the surface info of f cannot be

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2015-02-02 15:54:34 +01:00
Laurent Rineau 351e73373f Merge branch 'CGAL-fix_MSVC_warnings_with_TBB-lrineau' into releases/CGAL-4.5-branch
Tested in CGAL-4.5.2-Ic-178.
Approved by the Release Manager.
2015-01-28 18:12:53 +01:00
Laurent Rineau 626ec7a144 Disable the normal estimation plugin with Boost-1.57 and C++11
(cherry picked from commit bd43545717)
2015-01-28 18:07:21 +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 72e0a3e677 Fix warnings about signed/unsigned
The code involved is about TBB.
2015-01-21 12:59:07 +01:00
Laurent Rineau eb5e2c6800 Merge branch 'CGAL-fix_compilation_boost_1_56_4.5-branch-lrineau' into releases/CGAL-4.5-branch
Fix compilation with Boost>=1.56 in C++11. The `operator bool()` of
`boost::optional` and `boost::shared_ptr` are now explicit.
2015-01-20 13:07:23 +01:00
Laurent Rineau 9c5d626c43 Preparation for a CGAL-4.5.2 2015-01-20 13:05:51 +01:00
Laurent Rineau 45c47a9042 Add a comment about a bug in Boost-1.56 2015-01-14 14:53:20 +01:00
Laurent Rineau 8cfe633b2c Fix compilation errors with C++11 and Boost-1.56
Use *explicit* conversions to `bool`, for boost::shared_ptr and
boost::optional.

Conflicts:
	Convex_hull_3/include/CGAL/Convex_hull_3/dual/halfspace_intersection_3.h
2015-01-14 14:52:53 +01:00
Laurent Rineau 5134b29461 Update the changes.html file 2015-01-13 17:30:45 +01:00
Laurent Rineau f8b28c6ff8 Fix compilation with Boost-1.56 and later
In Boost-1.56 and later, with C++11, boost::optional::operator bool() is
explicit.
2015-01-13 16:59:07 +01:00
Sébastien Loriot 8d78c767ea Merge branch 'Convex_hull_3-fix_Convex_hull_traits_3_4.5-local' into releases/CGAL-4.5-branch
Tested in master branch in CGAL-4.6-Ic-99
  Approved by the release manager
2015-01-09 12:20:59 +01:00
Sébastien Loriot b7caf33fbd filter the predicates in Convex_hull_traits_3 if requested 2015-01-09 12:20:14 +01:00
Sébastien Loriot 6b9945c271 Merge branch 'Convex_hull_3-fix_2dhull_4.5-local' into releases/CGAL-4.5-branch
Tested in master in 4.6-Ic-99
  Approved by the release manager
2015-01-09 12:16:53 +01:00
Sébastien Loriot 90ee311ba9 fix the detection of the projection plane to compute a 2D chull
The previous version was using a construction.
    The concept and models become simpler.
2015-01-09 12:14:56 +01: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
Jane Tournois 90a74c1bb6 fix a bug that happens on vc10, because atomics are not initialized 2014-12-16 16:42:22 +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 5dbfeec3ae Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
Tested in CGAL-4.5.1-Ic-171
2014-12-12 15:29:51 +01:00
Sébastien Loriot 5b9be0f8c7 workaround ambiguous call in kernel intersection functions when including BSO_2 2014-12-11 16:33:29 +01:00
Laurent Rineau fc407cfebf 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.
2014-12-01 17:38:48 +01:00
Laurent Rineau bd2c6f890f 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.
2014-11-28 12:04:55 +01:00
Laurent Rineau ad53e42fb3 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.
2014-11-28 12:03:30 +01:00
Laurent Rineau 044660eb48 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.
2014-11-28 12:01:50 +01:00
Laurent Rineau 0c6153ce8c cleanup
I forgot to remove extra expensive assertions that I have used using the
debugging!

I clean up also a few spaces at end of lines.
2014-11-27 11:29:52 +01:00
Laurent Rineau 4464116c0d Test _WIN32 instead of _MSC_VER
With MinGW, __declspec is also implemented.

Reported in the CGAL-discuss mailing list:

  Date: Wed, 26 Nov 2014 14:59:46 +0000
  From: xantares 09 <xantares09@hotmail.com>
  To: "cgal-discuss@inria.fr" <cgal-discuss@inria.fr>
  Subject: [cgal-discuss] MinGW issues
2014-11-26 16:26:54 +01:00
Laurent Rineau 4bdafe6908 Bug-fix in Mesh_3 with time stamps
That is a follow-up to that commit:
  | commit eefe2012c0
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Thu Oct 2 16:59:19 2014 +0200
  |
  |     Bug-fix in Mesh_3 with time stamps
  |
  |     The implementation of the class template Protect_edges_sizing_field was
  |     not correct when time stamps are used for Vertex_handle. The issue is
  |     that the time stamp of a vertex change when one do:
  |       tr.remove(v);
  |       v = tr.insert(point);
  |     The vertex pointed by 'v' is re-used by the TDS, but the time stamp of
  |     the vertex does change.
  |
The fix was not complete.
2014-11-26 15:56:37 +01:00
Andreas Fabri b281d86414 We must run kruskal on the filtered graph to ignore the infinite vertex 2014-11-24 16:55:59 +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
Laurent Rineau a096cdf431 releases/CGAL-4.5-branch targets CGAL-4.5.1 2014-10-31 17:27:28 +01:00
Laurent Rineau f526ebd5cd Merge branch Mesh_3-fix_plugin_interface-cjamin' into releases/CGAL-4.5-branch
The changes the interface ID declared by
demo/Mesh_3/include/CGAL_demo/Plugin_interface.h, so that the ID of
plugin interface for the Polyedron demo and the Mesh_3 are
different. That will allow to have plugins for both demos in the same
directory.
2014-10-31 16:40:04 +01:00
Laurent Rineau d85eaa327c Merge remote-tracking branch 'origin/Mesh_3-fix_exuder_holes_on_surface-GF' into releases/CGAL-4.5-branch
Bug-fix for Mesh_3:
  Fix a bug in the sliver exudation preservation of boundaries.

Approved by the Release Manager.
2014-10-31 11:32:09 +01:00
Clement Jamin ae0a88708b Fix: a plugin may implement two interfaces 2014-10-29 15:34:01 +01:00
Clement Jamin 72513db3b0 Better console output 2014-10-29 15:14:08 +01:00
Clement Jamin 9979427337 Fix ID and #define 2014-10-29 15:13:31 +01:00
Clement Jamin faf129c1dc Fix interface name 2014-10-29 10:21:29 +01:00
Jane Tournois df0ec2e54d mention exuder bug fix in changes.html 2014-10-21 11:29:07 +02:00
Laurent Rineau 47708fd7e5 Fix a warning 2014-10-17 16:34:08 +02:00
Jane Tournois 2ff8f82bf2 improve the sorting function 2014-10-17 16:34:08 +02:00
Jane Tournois d9cb114484 get_umbrella fixed. It was responsible for holes on the output mesh surface
it collects edges incident to the internal facets of the conflict zone,
that are restricted to the surface.
For each such edge :
- if it appears once, we keep it
- if it appears twice, we don't consider it
- if it appears more than twice, we are in a non-manifold configuration,
and the move (pump) is canceled
2014-10-17 16:34:08 +02:00
Laurent Rineau 70b5a14c9a Fix the picking
There was two problems:
  - the handling of glPushName()/glPopName was not consistent,
  - the splatting MUST be deactivated during a picking.
2014-10-16 15:48:06 +02:00
Laurent Rineau 00a35cf3f5 Reformat to avoid wrapping 2014-10-10 16:41:17 +02:00