songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'

This commit is contained in:
Sébastien Loriot 2020-04-03 14:41:59 +02:00
parent bccba2d76f b3c82ab04f
commit 64a8db7644
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis/generate_travis.sh
View File

@ -21,14 +21,14 @@ for f in *
do do
if [ -d "$f/package_info/$f" ] if [ -d "$f/package_info/$f" ]
then then
PACKAGES[$INDEX]+="$f" PACKAGES[$INDEX]+="$f "
i=$[i+1] i=$[i+1]
if [ $i = 3 ] if [ $i = 3 ]
then then
i=0 i=0
INDEX=$[INDEX+1] INDEX=$[INDEX+1]
fi fi
echo "$f " >> ./.travis/packages.txt echo "$f" >> ./.travis/packages.txt
fi fi
done done
if [ -f ".travis.yml" ] if [ -f ".travis.yml" ]

4
Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_plus_2.h
View File

@ -245,9 +245,9 @@ Inserts a polyline defined by the points in the range `[first,last)`
and returns the constraint id. and returns the constraint id.
The polyline is considered as a closed curve if the first and last point are equal or if `close == true`. This enables for example passing the vertex range of a `Polygon_2`. The polyline is considered as a closed curve if the first and last point are equal or if `close == true`. This enables for example passing the vertex range of a `Polygon_2`.
When traversing the vertices of a closed polyline constraint with a `Vertices_in_constraint_iterator` the first and last vertex are the same. When traversing the vertices of a closed polyline constraint with a `Vertices_in_constraint_iterator` the first and last vertex are the same.
In case the range is empty `Constraint_id()`is returned. In case the range is empty `Constraint_id()` is returned.
In case all points are equal the point is inserted but no constraint, In case all points are equal the point is inserted but no constraint,
and `Constraint_id()`is returned. and `Constraint_id()` is returned.
\tparam PointIterator must be an `InputIterator` with the value type `Point`. \tparam PointIterator must be an `InputIterator` with the value type `Point`.
*/ */
template < class PointIterator> template < class PointIterator>