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

122 Commits

Author SHA1 Message Date
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch' 
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
 2019-06-20 14:20:37 +02:00
Mael Rouxel-Labbé 47b14e656d Fix order of checks to avoid calling back() on an empty vector 2019-05-24 08:14:12 +02:00
Mael Rouxel-Labbé 38afb85b61 Fix broken Bbox_2_ray/line by basing them on Iso_rectangle_2 
Removes the intersection(bbox_2, ray/line), but:
- it was broken
- it was undocumented

If it's needed, just use an Iso_rectangle instead.
 2019-05-20 10:54:17 +02:00
Mael Rouxel-Labbé ad1fbbd242 Fix Circle_2 -- Bbox_2/Iso_rectangle_2 intersection 
Bbox_2 is inherently inexact as it is double-based. Thus, Bbox_2 should
use its conversion to Iso_rectangle_2 (a kernel type) and not the other way
around, otherwise we are doing FT --> double --> FT and losing precision.
 2019-05-20 10:06:14 +02:00
Mael Rouxel-Labbé e23d76cfab Cosmetic changes 2019-05-17 14:47:31 +02:00
Mael Rouxel-Labbé 325be3560b Fix Bbox_2 Circle_2 intersection (bbox within circle is not an intersection) 2019-05-17 12:18:22 +02:00
Mael Rouxel-Labbé 36c6c4ca4e Move Circle_2 Iso_rectangle_2 overload to the appropriate function 2019-05-17 12:18:12 +02:00
Mael Rouxel-Labbé ab0ca8a735 Use the intersection traits macro to simplify code (cosmetic change) 2019-05-17 12:15:48 +02:00
Mael Rouxel-Labbé 58c894ed5e Add missing free function for Bbox_2 Point_2 intersection 2019-05-17 12:15:22 +02:00
Mael Rouxel-Labbé 80d1f3f18a Clean a bit Bbox_2_Ray/Line_2 do intersect files (but the code is still wrong) 2019-05-17 12:14:43 +02:00
Mael Rouxel-Labbé e4f7c720c7 Merge branch 'Intersection_2-Fix_Ray_triangle_degenrate_inter-GF' into Intersections_2-Populate_tests-GF 2019-05-16 15:09:23 +02:00
Mael Rouxel-Labbé bf8097dd6f Fix Triangle_2 Iso_rectangle_2 intersection 
std::unique does not handle the case where points are identical at the beginning
and the end of the vector
 2019-05-16 14:06:46 +02:00
Mael Rouxel-Labbé 90ba79493f Fix Ray_2 Triangle_2 intersection when the intersection is a point 2019-05-16 14:03:30 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch 
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
 2019-05-14 17:50:45 +02:00
Sébastien Loriot 1d908c1c0b remove code for CGAL_INTERSECTION_VERSION 1 2019-03-29 13:28:32 +01:00
Sébastien Loriot 82c13e6e74 remove cpp11 workaround in kernel related packages 2019-03-29 10:41:50 +01:00
Laurent Rineau fc04ed7609 Fix intersection(Point_2,Point_2) 
It seems it was never tested, and never worked.

PR #2792 introduced a compilation error in cgal-swig-bindings, by the
addition of `do_intersect(Point_2,Circle_2)` and
`intersection(Point_2,Circle_2)`:

> /usr/include/CGAL/Kernel/function_objects.h:2954:63: error: call of overloaded ‘do_intersect(const CGAL::Point_2<CGAL::Simple_cartesian<CGAL::Interval_nt<false> > >&, const CGAL::Point_2<CGAL::Simple_cartesian<CGAL::Interval_nt<false> > >&, CGAL::Simple_cartesian<CGAL::Interval_nt<false> >)’ is ambiguous
>     { return Intersections::internal::do_intersect(t1, t2, K()); }
>                                                               ^

https://travis-ci.org/CGAL/cgal-swig-bindings/jobs/509442278#L4727
 2019-03-22 11:28:26 +01:00
Maxime Gimeno bfa12738a6 Une CGAL_assume(false) for the default 2019-02-13 15:18:32 +01:00
Maxime Gimeno 959d65a5ee Also fix a warning in kernel 2019-02-13 13:45:16 +01:00
Andreas Fabri aac8ac4e6b Some changes after Sebastien's review 2018-11-29 15:58:34 +01:00
Sébastien Loriot 057f4eafe7 fix warning + cosmetic changes 2018-11-02 14:17:16 +01:00
Andreas Fabri 93d19591da To intersect a Circle_2 means to intersect the boundary 2018-05-30 15:24:50 +01:00
Andreas Fabri c908ed5fa2 No typename; no need for CGAL:: 2018-05-18 15:46:34 +01:00
Andreas Fabri 31b5d5d3aa Reorder inclusions 2018-05-17 15:27:58 +01:00
Andreas Fabri 05437e0c54 Add several 2D tests and functions 2018-05-17 15:23:04 +01:00
Andreas Fabri 1d12605ef4 Merge headers 2018-05-17 14:53:07 +01:00
Andreas Fabri 162241066b Remove CGAL_NO_INTERSECTION_FUNCTION and functions doing nothing 2018-05-17 11:52:58 +01:00
Andreas Fabri 2a78b7861b fix src 2018-05-04 09:00:11 +02:00
Andreas Fabri 43f8490920 Reorganize Intersections_2 header files 2018-05-04 09:00:10 +02:00
Andreas Fabri c9af36ca6a fix namespace 2018-05-04 09:00:09 +02:00
Andreas Fabri 4111e3e20c Reorganize header files 2018-05-04 09:00:07 +02:00
Andreas Fabri bf55dcd69c Cleanup in Intersections_2 2018-05-04 08:57:57 +02:00
Andreas Fabri 0d3ac75518 Introduce namespace Intersections 2018-05-04 08:57:56 +02:00
Andreas Fabri d26517bd8f more default: 2018-03-08 14:11:02 +00:00
Andreas Fabri 2e14ff9f04 Kernel 2018-01-17 19:59:11 +00:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Laurent Rineau 330a0e75a2 Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin 
CGAL headers only, step 0
 2015-10-13 16:37:38 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Andreas Fabri a2f954ebf9 Merge branch 'Intersections_3-snippet2example-GF-old' into Intersections_3-snippet2example-GF 2015-09-18 12:56:29 +02:00
Sébastien Loriot 6b0067f7ef fix intersection test in case no vertex is on bounded side 2015-07-29 18:17:27 +02:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00
Andreas Fabri 1f989622e7 replace \code with real examples 2015-02-09 10:54:24 +01:00
Laurent Rineau be079cb5a3 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:21:04 +01:00
Guillaume Damiand e8fe29c79c Ok for the compilation version header only (only for the treated files). 2014-10-31 17:09:48 +01:00
Guillaume Damiand 1182319f5d Redo all the modifs to remove all the cpp files from cgal. 
First step where all the XXX.cpp are copied into XXX_impl.h files.
The macro CGAL_HEADER_ONLY allows to know if impl files need to be
included or not into header files; and allow to decide if functions are
in impl files are inline or not.

Next step: process with static variables for the header only version.
 2014-10-30 16:05:22 +01:00