Commit Graph

285 Commits

Author SHA1 Message Date
Andreas Fabri 17ca29713a Add a forwarding function as we had to remove a using statement 2014-08-22 15:14:19 +02:00
Andreas Fabri ab7f0189bd remove debug output 2014-08-22 15:13:32 +02:00
Andreas Fabri 43b8390a70 Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF 2014-08-08 12:47:15 +02:00
Andreas Fabri 9243e1eb69 Unify APIs: Add insertion of a polyline 2014-07-16 15:30:14 +02:00
Sébastien Loriot 0230e979e2 Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
Conflicts:
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
	Documentation/doc/Installation.txt
	Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
Andreas Fabri 2c08831b35 add missing typename 2014-05-23 08:47:56 +02:00
Andreas Fabri c6bf236909 include header files where they are used 2014-05-22 14:49:38 +02:00
Andreas Fabri 8423854c95 Add Constrained_Delaunay_triangulation_2::insert_constraint(PointIterator,PointIterator) 2014-05-21 18:25:27 +02:00
Andreas Fabri 80798869fc Add Constrained_triangulation_plus_2::insert_constraints(..)
Before it inherited from the base class and did not update
the constraint hierarchy.
2014-05-21 17:17:40 +02:00
Andreas Fabri 6b129f3ad0 unify API 2014-05-20 17:39:56 +02:00
Andreas Fabri 2f967ba6e4 the testsuite for the new version of the Constrained_triangulation_plus_2 passes 2014-05-19 15:57:24 +02:00
Andreas Fabri 575b9081a7 make Constaint_id a struct so that we can write operator pair<Vertex_handle,Vertex_handle>() 2014-05-19 11:49:08 +02:00
Andreas Fabri a0d8e81a6f Fix the Polyline_constrained_triangulation for the Exact_constructions_tag
To avoid cascading the intersection is done with endpoints of segment constraints
For polyline constraints we cannot take the endpoints of the polyline
but must find input points of the polyline.
2014-05-16 14:48:20 +02:00
Andreas Fabri 85b29aed5f treat merge conflicts 2014-05-15 16:09:24 +02:00
Laurent Rineau ab7f9d0047 Fix a warning -Wmaybe-uninitialized
With g++48, with -Wall -O3, there was the following warning:

include/CGAL/Weighted_point.h:137:5: warning: '*((void*)& p +8)' may be used uninitialized in this function [-Wmaybe-uninitialized]
     wp = Weighted_point<Point,Weight>(p,w);
     ^
include/CGAL/Weighted_point.h:130:9: note: '*((void*)& p +8)' was declared here
   Point p;
         ^
include/CGAL/Weighted_point.h:137:5: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
     wp = Weighted_point<Point,Weight>(p,w);
     ^

Trivial bug-fix for master.
2013-12-12 17:44:00 +01:00
Sébastien Loriot 84d97f385d add insert_constraints functions to Constrained_Delaunay_triangulation_2 2013-12-02 22:48:38 +01:00
Andreas Fabri 9ed4f837c3 Merge branch 'CGAL-compilable_headers-GF'
The conflict was about whitesapce
Approved by the release manager

Conflicts:
	Polyhedron/include/CGAL/Polyhedron_copy_3.h
2013-09-23 14:50:17 +02:00
Laurent Rineau 650419f631 Trivial warning bug-fix for master (for CGAL-4.3) 2013-09-16 12:16:27 +02:00
Andreas Fabri 5c454cec64 add missing includes 2013-09-13 12:43:01 +02:00
Andreas Fabri d93bc127db Qualify call of derived function with this-> 2013-09-13 12:42:37 +02:00
Andreas Fabri 56d31513e6 fix incllude file. was not from the base class 2013-09-13 12:19:01 +02:00
Andreas Fabri 121ada60a4 Function must not only be declared but also defined to avoid VC++ warning 2013-09-12 12:49:04 +02:00
Sébastien Loriot 22b0d44f4a make the move function private to disable the inherited version 2013-08-02 07:52:09 +02:00
Sébastien Loriot f82d049dd1 make the triangulation iterator convertible to non-const handle
this pleases clang++3.2 with -std=cpp11 option
2013-07-25 07:40:38 +02:00
Jane Tournois 56d733b254 Merge remote-tracking branch 'origin/Mesh_3-improvements-GF'
Several improvements of Mesh_3, including
- speedup of optimizers,
- make inexact_locate public in Triangulation_2 and Triangulation_3,
- compactify mesh_cell_base and mesh_vertex_base,
- fix of documentation,
- and more

Small feature :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Various_improvements_of_Mesh_3

Approved by the release manager.
2013-07-01 16:25:56 +02:00
Guillaume Damiand 6ba0055694 Trivial bug-fix qualified for master:
/Users/cgaltester/cgal_test/CGAL-4.3-Ic-71/include/CGAL/Triangulation_data_structure_2.h:1858:41: warning: unused parameter 'src' [-Wunused-parameter]
    Face_tgt operator()(const Face_src& src) const
2013-06-25 12:32:59 +02:00
Jane Tournois 404f2e0e3c merge 2013-06-21 10:01:19 +01:00
Sébastien Loriot 8d602ed8c2 Merge branch 'triangulation_3-copy_tds-sloriot'
Approved by the release manager

Conflicts:
	Alpha_shapes_3/test/Alpha_shapes_3/copy_tds.h
	Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h

it introduces a more general copy_tds that allows to copy tds with different types of simplices.
2013-04-29 11:09:01 +02:00
Sébastien Loriot bb7f025512 more permissive copy_tds for compatible vertex types with the same point type 2013-04-19 08:44:45 +02:00
Andreas Fabri 76a386bd18 make polylines.cpp work with EPEK 2013-04-17 09:38:23 +02:00
Andreas Fabri e4306a0d3d fixed -> unremovable; fixed is no longer used in Polyline_constrained_trioangulation 2013-04-16 16:01:09 +02:00
Andreas Fabri 94567d8745 wip 2013-04-16 15:09:05 +02:00
Andreas Fabri 80ef57d590 rename class 2013-04-16 12:46:34 +02:00
Sébastien Loriot 62fcc226b8 add a method to insert a range of points with info in cdt 2013-04-16 07:37:51 +02:00
Jane Tournois a9275d1a5b add default value for start of inexact_locate 2013-04-12 14:48:10 +02:00
Jane Tournois e023f42a51 make inexact_locate public also in Triangulation_2 2013-04-12 14:32:16 +02:00
Sébastien Loriot f9e0c97aac for convenience add a default to simple converter
it is useful if you want to copy the tds of a familly
alpha-shape into a fixed one
2013-04-11 20:03:32 +02:00
Andreas Fabri 5e08e87d3d Make the example more interesting.
Fix const correctness.
Fix the Subconstraint_iterator.
Improve the manual.
2013-04-03 15:28:46 +02:00
Andreas Fabri f7d7395864 Merge branch 'OLD' into CGAL-use_leda-GF
Conflicts:
	Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp
	Envelope_2/test/Envelope_2/test_envelope_segments.cpp
	Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp
2013-03-27 20:22:54 +01:00
Laurent Rineau b6ffa7c425 Merge branch 'CGAL-fix_warnings-GF'
That branch was successfully tested in CGAL-4.2-Ic-205.
2013-03-27 12:23:31 +01:00
Andreas Fabri 8a45fcea5a Merge branch 'OLD' into Triangulation_2-NewPolylineConstraint-GF
Conflicts:
	Triangulation_2/doc/Triangulation_2/Triangulation_2.txt
2013-03-21 13:41:53 +01:00
Laurent Rineau 6026df138a Fix mis-compilations of Triangulation_2 with -O3 -DCGAL_NDEBUG
With recent g++ versions, when -DCGAL_NDEBUG and -O3 was in the compilation
flags, my patch using 'CGAL_assume' triggered mis-compilation of cases
where the dimension() was 1, for all uses of the following pattern:

  CGAL_assume(i>=0 && i<= 1);
  [...] 1-i [...]

The fix is to use "(i==0)?1:0" instead.
2013-03-19 14:29:18 +01:00
Andreas Fabri 67226de083 use CGAL::compare instead of compare to avoid Koenig lookup 2013-03-15 16:25:05 +01:00
Andreas Fabri 950e858555 remove unused parameters 2013-03-12 09:50:46 +01:00
Laurent Rineau ef37a934a6 Fix warning "_ri may be used uninitialized" 2013-02-27 19:35:56 +01:00
Laurent Rineau 403031ce7f Fix warnings 2013-02-27 18:21:24 +01:00
Andreas Fabri c7e68385be remove unused variables and #if 0 buggy non used code 2013-02-26 16:52:55 +01:00
Laurent Rineau 2d8da664a3 Merge branch 'CGAL-fix_warnings-gdamiand'
Conflicts:
	.gitignore
	Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
2013-02-22 13:02:37 +01:00
Laurent Rineau 66c5d23154 Use CGAL_assume to remove warnings 2013-02-20 18:55:43 +01:00
Sébastien Loriot e9e31dc6f3 remove unused file 2013-02-19 13:57:41 +01:00