Commit Graph

3187 Commits

Author SHA1 Message Date
Sebastien Loriot b02bf1c6e7
Merge pull request #4577 from theartful/bezier_bugfix
Fix bug in point_position in the bezier traits
2020-04-22 13:05:47 +02:00
Efi Fogel 5d37a1bbf8 Initialized some fileds of _Linear_object_cached_2 2020-04-22 00:31:33 +03:00
Efi Fogel 6fcbee1fa9 Removed redundant typedef statements 2020-04-21 17:12:21 +03:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Efi Fogel 61d51502c0 Fixed documentation of intersection return types 2020-04-06 16:37:46 +03:00
Efi Fogel 50fd3f8fd7 Fixed documentation of intersection return types 2020-04-06 16:24:48 +03:00
Efi Fogel 6eefda4e6d Added missing include <boost/variant.h> 2020-04-06 15:34:28 +03:00
Efi Fogel 4158542c86 Fixed intersection result 2020-04-01 12:31:51 +03:00
Efi Fogel 58276edba3 Cleaned up and Fixed intersection return type 2020-03-31 18:34:28 +03:00
Efi Fogel 523fcfdbc5 Cleaned up 2020-03-31 17:32:38 +03:00
Efi Fogel c1fed0bd0b Cleaned up 2020-03-31 17:30:55 +03:00
Efi Fogel 11059b4f84 Fixed typo 2020-03-29 13:33:08 +03:00
Efi Fogel dc0cab62a4 Fixed Intersect_2 to return optional of variant (instead of CGAL::Object) 2020-03-29 13:31:26 +03:00
Efi Fogel 077829724a Cleaned up; used result_of when computing intersections. 2020-03-29 13:25:18 +03:00
Efi Fogel f5f3440fc0 Used correct result of intersection 2020-03-29 13:02:24 +03:00
Efi Fogel 04adcb982f Cleaned up 2020-03-29 12:34:33 +03:00
Ahmed Essam 30104c6032 Fix bug in matching roots 2020-03-27 08:34:04 +01:00
Sébastien Loriot 97e46accad extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:26:37 +01:00
Sébastien Loriot 34ce87be56 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:26:15 +01:00
Sébastien Loriot 180c06146f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:10:41 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
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 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot 2419170514 be resilient to the absence of trailing whitespace in input 2020-03-26 13:24:27 +01:00
Ahmed Essam a7eb7cfe04 Fix bug in point_position in the brazier traits 2020-03-12 23:14:42 +02:00
Guillaume Damiand 5c9bb6f016 Rename PTR into PTR.p following the modifs in Handle.h 2020-02-14 11:30:56 +01:00
Sébastien Loriot c662a59645 avoid a construction
this helps the sweep working with EPICK in case no
new construction are needed
2019-11-26 17:00:59 +01:00
Laurent Rineau 092cf8e2c5 Merge pull request #4284 from sloriot/Sweep_surface_2-derecursive_overlaps_5.0
Derecursification of overlaps detection on the right of event - [5.X]
2019-10-25 16:26:17 +02:00
Sébastien Loriot 47c092557f Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 2019-10-21 13:04:25 +02: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 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot d0f23b56f6 update deprecated 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-only/"
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-only/"
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-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
2019-10-18 22:08:05 +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
Sébastien Loriot 90b199b952 fix typos 2019-10-18 09:40:01 +02:00
Laurent Rineau 13beab6ae3 Merge pull request #4278 from sloriot/AOS_2-Trapezoid_map_fixes
Trapezoid map fixes
2019-10-16 18:18:30 +02:00
Laurent Rineau 7143b69bb1 fix warning
```
include/CGAL/Arr_point_location/Td_active_trapezoid.h:98:10: warning: class Non_recursive_td_map_item_destructor was previously declared as a struct [-Wmismatched-tags]
  friend class internal::Non_recursive_td_map_item_destructor<Traits>;
         ^
```
2019-10-16 18:18:01 +02:00
Laurent Rineau e81a805cf6 Merge pull request #4278 from sloriot/AOS_2-Trapezoid_map_fixes
Trapezoid map fixes
2019-10-15 16:33:29 +02:00
Sébastien Loriot 770da55188 Prevent recursive calls to ~Handle while clearing the dag or removing elements in the dag 2019-10-09 18:15:31 +02:00
Sébastien Loriot 9694f5b1ce avoid extra call to random_shuffle 2019-10-08 18:10:26 +02:00
Sébastien Loriot f3092b5438 hide debug info 2019-10-08 18:01:05 +02:00
Sébastien Loriot 11b865e4e4 remove duplicate halfedges before rebuild
a halfedge can be associated to several nodes in the dag
(since a halfedge can contribute to several trapezoids)
2019-10-08 17:14:13 +02:00
Sébastien Loriot 678811cdde fix typo 2019-10-08 17:13:36 +02:00
Sébastien Loriot b2eb6a405b fix cw update
direction is not a good criteria, especially for dangling edges
2019-10-07 16:00:18 +02:00
Sébastien Loriot 08a3411d85 fix the update of cw halfedge of active vertex after update
cw source must be v and cw is the first halfedge seen from noon
when using cw order
2019-10-07 15:58:42 +02:00
Efi Fogel be96223d8e Fixed discrepancy between traits and subcurve-traits in the polycurve basic traits. 2019-09-18 13:20:17 +03:00
Efi Fogel ea6b70dfbc Down casted a variable of type Point_2 (extended direction) to the Kernel::Direction_2 type, so that it can be passed to kernel functors. 2019-09-18 13:19:30 +03:00
Laurent Rineau 2a5b7cd7ba Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
Fix CTest on windows
2019-09-05 14:59:38 +02:00
Laurent Rineau 94d654b9ab Fill CGAL_EXECUTABLE_TARGETS wherever that was missing 2019-09-04 14:19:54 +02:00
Sebastien Loriot 6cab82b7c8
Merge pull request #4169 from sloriot/Argt-doc_fixes
User manual fixes
2019-08-27 06:18:16 +02:00
Sébastien Loriot 3787e86753 doc fix 2019-08-21 09:10:37 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11
Remove CGAL_CXX11 macro usage
2019-07-19 16:16:22 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Laurent Rineau d3b9d89596 Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
2019-07-10 14:22:53 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau 7b0c6f0cf7 Fix a stack-use-after-scope in Arr_polycurve_basic_traits_2
Before this patch, `Arr_polycurve_basic_traits_2` was holding a const
reference to a temporary object.

Here was the result of ctest, with the address sanitizer:
```shellsession
$ make && ASAN_OPTIONS=detect_leaks=0 ctest -L Arr -j6
[...]
The following tests FAILED:
        144 - execution___of__generic_curve_data (Failed)
        170 - execution___of__polycurve_circular_arc (Failed)
        172 - execution___of__polycurve_conic (Failed)
        176 - execution___of__polycurves_basic (Failed)
        178 - execution___of__polylines (Failed)
        2166 - test_traits_test_polylines__data_polylines_compare_y_at_x__polyline_traits (Failed)
        2168 - test_traits_test_polylines__data_polylines_intersect__polyline_traits (Failed)
        2169 - test_traits_test_polylines__data_polylines_split__polyline_traits (Failed)
        2171 - test_traits_test_polylines__data_polylines_assertions__polyline_traits (Failed)
        2175 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x__polycurve_conic_traits (Failed)
        2176 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x_left__polycurve_conic_traits (Failed)
        2177 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x_right__polycurve_conic_traits (Failed)
        2179 - test_traits_conic_polycurve__data_polycurves_conics_intersect__polycurve_conic_traits (Failed)
        2180 - test_traits_conic_polycurve__data_polycurves_conics_split__polycurve_conic_traits (Failed)
        2193 - test_traits_circular_arc_polycurve__data_Polycurves_circular_arcs_compare_y_at_x__polycurve_circular_arc_traits (Failed)
        2198 - test_traits_circular_arc_polycurve__data_Polycurves_circular_arcs_split__polycurve_circular_arc_traits (Failed)
        2221 - test_traits_non_caching_polylines__data_polylines_compare_y_at_x__non_caching_polyline_traits (Failed)
        2223 - test_traits_non_caching_polylines__data_polylines_intersect__non_caching_polyline_traits (Failed)
        2224 - test_traits_non_caching_polylines__data_polylines_split__non_caching_polyline_traits (Failed)
        2226 - test_traits_non_caching_polylines__data_polylines_assertions__non_caching_polyline_traits (Failed)
        2400 - execution___of__test_construction_polylines (Failed)
        2477 - execution___of__test_io (Failed)
```

This is fixed rather easily, by copying the traits class, instead of
holding a reference to it.
2019-06-18 15:18:15 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Laurent Rineau 7e58feacfe Merge pull request #3797 from afabri/CGAL-Exact_algebraic-GF
Number_types:  Add Exact_algebraic
2019-05-21 16:37:07 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +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
Laurent Rineau 2f8eeb0db3 Fix the headers dependency-hell around gmpxx in Number_types 2019-05-09 15:05:23 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot 4464229a52 remove cpp11 workarounds in argt related packages 2019-03-29 10:41:50 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Andreas Fabri a1609350aa Remove #include<CGAL/basic.h> amd put what is needed if something is missing 2019-03-27 15:21:33 +01:00
Laurent Rineau 6a2b92f7e7 Adapt the Arrangement_on_surface_2 testsuite to LEDA 2019-03-27 14:16:50 +01:00
Maxime Gimeno cd97b36e9b Fixes in arrangement 2019-03-27 14:16:50 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 9d40c3e1fc Merge pull request #3769 from sloriot/CGAL-doc_fixes
Various doc fixes
2019-03-19 18:30:36 +01:00
Sébastien Loriot d2c10d1fde remove macro defined twice 2019-03-15 09:31:34 +01:00
Maxime Gimeno 330c6ec9b1 Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
Testsuite : Use ctest
2019-03-12 17:04:19 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Maxime Gimeno 7407a432ce Merge branch 'master' of https://github.com/CGAL/cgal into Cross_compilation-Update_scripts-GF 2019-02-28 11:59:04 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Laurent Rineau 5376673151 Fix the testsuite of Arrangement_on_surface_2 2019-02-21 17:00:53 +01:00
Laurent Rineau a144940b6d Use cgal_add_test for every tests of Arrangement_on_surface_2 2019-02-21 12:24:17 +01:00
Laurent Rineau b56f51982b Merge pull request #3591 from albert-github/feature/bug_advanced_concept
Make advanced concept documentation analogous to advanced class.
2019-02-16 14:00:21 +01:00
Andreas Fabri e62ab30e6c Fixes of fixes 2019-02-15 09:03:58 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 20a3888f0a remove unused concept 2019-02-13 19:12:43 +01:00
Andreas Fabri dcb6c1478c Fix Arrangement_2 2019-02-08 08:57:43 +01:00
Andreas Fabri cc23699ea0 fix Arrangement_2 2019-01-28 09:14:59 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00