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

1201 Commits

Author SHA1 Message Date
Sébastien Loriot a99916f6c9 Merge pull request #5806 from GilesBathgate/Nef_3-dead_code_k3_tree_snc_point_locator-GilesBathgate 
Remove dead code in SNC_point_locator and K3_tree
 2021-07-19 08:04:47 +02:00
Sebastien Loriot 6948144f50
Merge pull request #5815 from GilesBathgate/Nef_3-remove_point_locator_naive-GilesBathgate 
Nef_3 Remove naive point locator.
 2021-07-19 08:03:12 +02:00
Sebastien Loriot 40f507a1f1
Merge pull request #5800 from MaelRL/SS-Doc_fixes-GF 
Harmonization of some IO stream documentation
 2021-07-19 07:56:48 +02:00
Maxime Gimeno 83b69b5a98 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-07-08 11:33:42 +02:00
Giles Bathgate 8b3fab7a91 Remove code related to CGAL_NEF3_POINT_LOCATOR_NAIVE 2021-06-29 17:51:19 +01:00
Giles Bathgate abb11ad1e4 Remove update/bytes/leafs functions, and Objects_around_box 2021-06-27 09:44:53 +01:00
Sébastien Loriot 142fac63b5 Merge pull request #5699 from GilesBathgate/Nef_3-snc_decorator_deduplication-GilesBathgate 
Remove duplicate code in SNC_const_decorator/SNC_decorator
 2021-06-25 09:47:59 +02:00
Sebastien Loriot a7cad1caf6
Merge pull request #5740 from GilesBathgate/Nef_3-remove_triangulate_facets-GilesBathgate 
Remove CGAL_NEF3_TRIANGULATE_FACETS
 2021-06-25 09:31:00 +02:00
Sebastien Loriot 5de3bdb9f3
Merge pull request #5714 from GilesBathgate/Nef_3-performance_k3_rc_hashmap-GilesBathgate 
Remove the OnSideMapRC when not needed
 2021-06-25 09:29:31 +02:00
Sebastien Loriot 11bc0e4e7e
Merge pull request #5702 from GilesBathgate/Nef_3-disable_nef_trace-GilesBathgate 
Replace CGAL_NEF_DEBUG with CGAL_USE_TRACE
 2021-06-25 09:29:03 +02:00
Sebastien Loriot 0d3b8d448d
Merge pull request #5696 from GilesBathgate/Nef_3-dead_code_snc_decorator-GilesBathgate 
Remove dead code in SNC_decorator/SNC_const_decorator
 2021-06-25 09:28:17 +02:00
Mael Rouxel-Labbé 78ff9185b3 Harmonize ASCII usage across all packages 2021-06-23 23:34:32 +02:00
Giles Bathgate ef39bfea74 Fix indentation in SNC_decorator 2021-06-17 11:03:49 +01:00
Giles Bathgate f30eeedda4 Remove CGAL_NEF3_TRIANGULATE_FACETS code 2021-06-17 10:59:25 +01:00
Giles Bathgate 5e9f9d313f Add conditional compilation for code used by CGAL_NEF3_TRIANGULATE_FACETS 2021-06-17 10:47:26 +01:00
Giles Bathgate 77a03f2084 Remove un-needed template parameters 2021-06-17 09:28:59 +01:00
Laurent Rineau 6a9061668c Merge pull request #5756 from albert-github/feature/bug_redirects 
Correction of hyperlinks
 2021-06-16 15:06:08 +02:00
Giles Bathgate 458ecf1ac1 Remove CGAL_NEF3_FACET_WITH_BOX code 2021-06-08 17:32:12 +01:00
albert-github 2a54687e77 Correction of hyperlinks 
The link checker gave a number of redirects and incorrect links.
- the redirects have been solved ass far as possible
- the incorrect links have been checked and corrected where possible, others  have been reported through issues;
 2021-06-04 13:52:14 +02:00
Maxime Gimeno 2d5f91f763 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-05-27 09:06:59 +02:00
Laurent Rineau e3d5fccf5b Merge pull request #5684 from GilesBathgate/Nef_3-performance_snc_constructor-GilesBathgate 
Nef_3 performance - has_on_after_intersection in SNC_constructor
 2021-05-19 17:24:08 +02:00
Laurent Rineau 59a0da4f13 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno 
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
 2021-05-19 17:23:53 +02:00
Laurent Rineau 3992ab34f3 Merge pull request #5712 from GilesBathgate/Nef_3-bounded_side_projection-GilesBathgate 
Remove redundant code in side_of_plane_3
 2021-05-19 17:23:19 +02:00
Laurent Rineau 82bec8a1d6 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno 
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
 2021-05-19 17:11:37 +02:00
Laurent Rineau 4a2f016f6a Merge pull request #5617 from afabri/Nef_3-translation-GF 
Nef_3: Add Aff_transformation_3::is_translation()
 2021-05-18 18:14:17 +02:00
Laurent Rineau 2c4a5db3ce Merge pull request #5631 from GilesBathgate/STL_ext-fix_uncaught_exceptions_cleanup-GilesBathgate 
Fix uncaught exceptions cleanup
 2021-05-18 18:14:14 +02:00
Maxime Gimeno 3795c5236a Changes after review 2021-05-18 10:16:24 +02:00
Giles Bathgate 476f2da967 Remove unused SNC_decorator 2021-05-16 20:00:08 +01:00
Giles Bathgate 5ffbd68921 Remove the OnSideMapRC when not needed 2021-05-15 15:59:06 +01:00
Giles Bathgate a91c0ed052 Replace implementation with traits 2021-05-14 18:17:01 +01:00
Giles Bathgate f3f6bebe60 Replace CGAL_NEF_DEBUG with CGAL_USE_TRACE 2021-05-12 07:37:49 +01:00
Giles Bathgate 9da2a72dbf Remove code duplication of get_visible_facet 2021-05-11 08:55:01 +01:00
Giles Bathgate 01f812e48e Remove other unused get_visible_facet methods 2021-05-11 08:20:12 +01:00
Giles Bathgate 3097e8e39a Remove adjacent_sface from SNC_const_decorator 2021-05-11 08:05:07 +01:00
Giles Bathgate 3ae3783491 Introduce base class members with using 2021-05-10 20:42:08 +01:00
Giles Bathgate 77054d4f2a Remove duplicate code in SNC_const_decorator/SNC_decorator 2021-05-10 18:26:29 +01:00
Giles Bathgate 4a29e91725 Remove commented out code from SNC_const_decorator 2021-05-09 22:24:49 +01:00
Giles Bathgate 91400c3fc1 Remove dead code in SNC_decorator 2021-05-09 10:48:02 +01:00
Maxime Gimeno 3e03d50b8a replace usages of CGAL::cpp11::atomic and thread by std:: calls 2021-05-07 11:10:30 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Giles Bathgate 43115e4345 Use has_on_after_intersection in SNC_constructor 2021-05-05 21:57:47 +01:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Giles Bathgate 5ecd85248a Fix capitalisation of macro name. 2021-04-28 21:03:45 +01:00
Giles Bathgate 0ef8127c71 The CGAL_NOEXCEPT macro is no longer needed 2021-04-28 21:03:00 +01:00
Giles Bathgate 890211ef87 Fix uninitialized member in K3_tree.h 2021-04-28 20:51:09 +01:00
Laurent Rineau 6ecaa770bb Merge pull request #5595 from afabri/Nef_3-Use_CC_for_Kd_tree-GF 
Nef_3: Improve K3_tree
 2021-04-28 15:24:13 +02:00
Andreas Fabri c238e9dab5 Merge remote-tracking branch 'cgal/master' into Nef_3-translation-GF 2021-04-27 15:23:56 +01:00
Andreas Fabri e6a55d8462 Fix #5613 as discussed in PR #5635 2021-04-23 11:55:16 +01:00
Andreas Fabri b79b43c793 Two more const 2021-04-23 08:38:09 +01:00
Andreas Fabri 7485e3887b Improve documentation and the example that performs affine transformations 2021-04-22 13:43:07 +01:00
Andreas Fabri 10e7b1a320 Address warning: type qualifiers ignored on function return type [-Wignored-qualifiers] 2021-04-22 08:58:33 +01:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno 
Update maximum cmake versions
 2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Andreas Fabri dd0d629635 Use Get_approx instead of approx() 2021-04-15 08:28:40 +01:00
Andreas Fabri ac9b5b2fbd Add Aff_transformation_3::is_translation() which checks the rep 2021-04-13 19:38:28 +01:00
Andreas Fabri 9c07709cf6 Do not first generate a Lazy_exact_nt to then obtain the interval, but use the approximate point (in case of Epeck) 2021-04-13 15:47:54 +01:00
Andreas Fabri 6a2c040285 If the segments have a common endpoint they do not intersect internally 2021-04-12 11:52:07 +01:00
Andreas Fabri 46a905ad75 Use nullptr 2021-04-12 09:21:58 +01:00
Andreas Fabri b5e76c4203 Use nullptr 2021-04-12 09:13:48 +01:00
Andreas Fabri 0246431abd Replace Compact_container with boost::container::deque 2021-04-12 09:08:36 +01:00
Andreas Fabri c2a71f23d7 Nef_3: Improve K3_tree 2021-04-08 16:08:51 +01:00
Andreas Fabri 50389862bf Remove unused local variable (why did no compiler warn?) 2021-04-07 12:01:02 +01:00
Andreas Fabri 6192307d78 This mainly avoids a filter failure 2021-04-06 14:46:45 +01:00
Laurent Rineau 80e0ffc750 Merge pull request #5144 from GilesBathgate/id-support-handler-hash-performance 
Proposed fix for unnecessary allocations in ID_support_handler. Issue #5143
 2021-04-06 15:13:18 +02:00
Laurent Rineau 31b817c419 Merge pull request #5233 from GilesBathgate/fix-uncaught-exceptions 
Fix uncaught exceptions
 2021-04-06 15:13:16 +02:00
Laurent Rineau de704d8bb9 Merge pull request #5522 from afabri/Nef_3-accelerate_do_intersect_internally-GF 
Nef_3: Do not test has_on for a point where we know that it will be true
 2021-04-06 15:13:07 +02:00
Andreas Fabri 5213cd3bfe replace include 2021-04-01 18:11:42 +01:00
Andreas Fabri b4e98df117 cleanup 2021-03-25 11:54:29 +01:00
Andreas Fabri e1a9cfc6ba Also break the outer loop 2021-03-24 16:10:06 +01:00
Giles Bathgate d5032ec5ea
Merge branch 'master' into id-support-handler-hash-performance 2021-03-24 14:15:50 +00:00
Laurent Rineau d6e9bdd0c1 Merge pull request #5269 from GilesBathgate/move-assignment-operators 
Move assignment operators
 2021-03-24 15:05:39 +01:00
Laurent Rineau 45800d2ab6 Merge pull request #5498 from GilesBathgate/cleanup-index-adder 
Cleanup index adder in polygon_mesh_to_nef_3
 2021-03-24 15:05:22 +01:00
Andreas Fabri e98198178f Add the functor Non_zero_dimension_3 to the Kernel 2021-03-23 15:45:54 +01:00
Maxime Gimeno 735567531b RENAME 2021-03-19 12:00:08 +01:00
Giles Bathgate 6a27761f4f Add homogeneous/cartesian specialisations 2021-03-13 17:31:38 +00:00
Andreas Fabri 54b55e0a48 Stupid me, after even have explained how interval arithmetic sometimes does not work 2021-03-13 16:55:32 +00:00
Andreas Fabri bd1b96e73b Do not compute a scalar product to determine best projection direction 2021-03-11 16:27:37 +00:00
Andreas Fabri d04b26b0e4 Avoid a geometric test 2021-03-11 13:32:46 +00:00
Laurent Rineau efc45cb686 Merge pull request #5455 from GilesBathgate/performance-plane-assertions 
Bypass coplanarity assertion for triangular facets.
 2021-03-03 17:29:43 +01:00
Laurent Rineau f29eb6d90b Merge pull request #5470 from GilesBathgate/performance-remove-double-simplify 
Explicitly call simplify after marking bounded volumes
 2021-03-03 17:29:32 +01:00
Giles Bathgate 5afc28348e Rename method in both templates for Face_graph_index_adder 2021-03-03 08:23:39 +00:00
Giles Bathgate 30e536bdf0 Remove default paramter from set_index in SNC_indexed_items 2021-03-01 08:06:48 +00:00
Giles Bathgate 3de90de34b Correct variable name in Face_graph_index_adder 2021-03-01 07:37:46 +00:00
Giles Bathgate d23fca2a47 Use new_index in several other places 2021-02-27 12:32:26 +00:00
Giles Bathgate a143b60040 Rename hash to SHalfedge list since its not really a hash 2021-02-27 12:31:13 +00:00
Giles Bathgate fed29a6b85 Use SHalfedge handle instead of repeated vector lookup 2021-02-27 11:58:01 +00:00
Andreas Fabri 57033b4b03 int -> std::size_t 2021-02-26 16:58:22 +00:00
Andreas Fabri 2c816b9291 Use property_traits 2021-02-24 18:02:42 +00:00
Andreas Fabri 254ce42109 Remove Face_info but keep a second vector for num_edges 2021-02-24 17:40:23 +00:00
Laurent Rineau 1958c95797 Merge pull request #5412 from GilesBathgate/performance-calculate-normals 
Calculate normals for facets more efficiently
 2021-02-18 21:02:36 +01:00
Giles Bathgate 113298056d Explicitly call simplify after marking bounded volumes 2021-02-17 20:00:34 +00:00
Giles Bathgate ff9ebb5847 Avoid duplicate lookups of pv in polygon_mesh_to_nef_3 2021-02-13 11:15:40 +00:00
Giles Bathgate c0c664a7e4 Fix pedantic warning in polygon_mesh_to_nef_3 2021-02-13 11:15:39 +00:00
Giles Bathgate 5ba988c6fa Bypass coplanarity assertion for triangular facets 2021-02-13 11:15:39 +00:00
Giles Bathgate 393b49f96d Use boost::hash_combine and std::unordered_map for ID support handler 2021-02-11 18:29:44 +00:00
Andreas Fabri 5345986827 Fix typo in Homogeneous case (which I hadn't tested) 2021-02-10 11:13:14 +00:00
Andreas Fabri 6335c1068c Advance copies of the iterator 2021-02-10 10:53:37 +00:00
Giles Bathgate 0f751faa24 Implement hash of halffacet_pair for ID support handler 2021-02-09 22:14:10 +00:00
Giles Bathgate ce7d06d5f4 Disable NEF trace unless the user specifically wants it 2021-02-07 11:55:29 +00:00
Laurent Rineau 3bd7181ff3 Merge pull request #5244 from afabri/Triangulation_2-Intersect_use_variant-GF 
Nef_3, Triangulation_2:  Change the result type of the Intersect_2 functor
 2021-02-05 16:12:58 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno 
Graphics_view: Upgrade glsl version in basic_viewer_shaders
 2021-02-05 16:12:42 +01:00
Laurent Rineau e1870c1522 Merge pull request #5371 from maxGimeno/Fix_Nesf_2_parser-maxGimeno 
Fix OOB issues in Nef_*
 2021-02-05 16:10:29 +01:00
Laurent Rineau b134ed8246 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno 
Graphics_view: Upgrade glsl version in basic_viewer_shaders
 2021-02-05 16:07:32 +01:00
Laurent Rineau a5cd24dd2a Merge pull request #5371 from maxGimeno/Fix_Nesf_2_parser-maxGimeno 
Fix OOB issues in Nef_*
 2021-02-05 16:07:25 +01:00
Laurent Rineau 5380ffd257 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno 
Graphics_view: Upgrade glsl version in basic_viewer_shaders
 2021-02-05 16:05:55 +01:00
Giles Bathgate e87432f257
Use std:next for is_triangle_3 in normal vector newell 
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
 2021-02-02 08:14:32 +00:00
Giles Bathgate 87b2c5e287 Improvements to normal vector newell after review 2021-01-30 11:36:41 +00:00
Giles Bathgate 83d7a89f22 Calculate normals for facets more efficiently 2021-01-29 17:32:05 +00:00
Maxime Gimeno 23cc6b0f4a Fix read_sface 2021-01-27 10:20:17 +01:00
Maxime Gimeno d78842712c Fix conversion warnigns 2021-01-26 10:22:18 +01:00
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Laurent Rineau 09f4237245 Merge pull request #5268 from GilesBathgate/fix-dead-code-snc-simplify 
Fix structurally dead code in SNC_simplify.h
 2021-01-22 09:35:59 +01:00
Laurent Rineau 1d805c82b1 Merge pull request #5289 from GilesBathgate/fix-big-param-by-value-snc-parser 
Fix passing big parameters by value in SNC_io_parser.h
 2021-01-22 09:35:54 +01:00
Andreas Fabri 5ea5e93f45 Fix warning 2021-01-20 15:17:41 +00:00
Maxime Gimeno 2e592e0027 Fix typo and use setstate 2021-01-20 08:38:33 +01:00
Maxime Gimeno 9e291e6bbf replace cerr by CGAL_warning_msg 2021-01-19 14:04:54 +01:00
Maxime Gimeno 5a1ab45058 Fix Nef_3 2021-01-19 12:24:08 +01:00
Andreas Fabri 168631b069 fix . to -> 2021-01-19 09:28:57 +00:00
Andreas Fabri 8765c63e9c bug fix 2021-01-15 07:55:27 +00:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 5d2ad68148 Add new Dependences. ATTENTION BGL is propagated through the NPs in Stream_support 2021-01-08 15:58:46 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Andreas Fabri f25363131d Switch to variant in Nef_3 2021-01-07 10:27:22 +00:00
Giles Bathgate dd636afbc3 Use SNC_const_decorator for additional sorts and finds 2020-12-18 12:00:14 +00:00
Giles Bathgate fe61108b32 Use SNC_const_decorators to allow const constructor references 2020-12-17 22:43:47 +00:00
Giles Bathgate 0ff1aa98ba Fix passing big parameters by value in SNC_io_parser.h 2020-12-16 07:43:22 +00:00
Giles Bathgate 6b9fd0c2df Add move assignment operator to SHalfedge.h 2020-12-13 16:07:45 +00:00
Giles Bathgate 70887f532d Add move assignment operator to Halfedge.h 2020-12-13 15:30:35 +00:00
Giles Bathgate c85e94243d Add move assignment operator to SHalfloop.h 2020-12-13 14:59:59 +00:00
Giles Bathgate f5563a73d0 Add a move assignment operator to Nef_Polyhedron.h 2020-12-13 13:50:19 +00:00
Giles Bathgate 8b39925a60 Fix structurally dead code in SNC_simplify.h 2020-12-11 14:54:16 +00:00
Maxime Gimeno 1d98f0f71d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-12-09 14:40:02 +01:00
Giles Bathgate ce26378d54 Fix uncaught exception in SNC_point_locator.h 2020-11-29 12:11:37 +00:00
Giles Bathgate 96024d1bb1 Fix uncaught exception in K3_tree.h 2020-11-28 14:25:25 +00:00
Giles Bathgate 9e9242e5dd Fix dereference after null check in Nef_3/Vertex.h 2020-11-27 13:47:21 +00:00
Giles Bathgate e6e63c93d6 Fix uninitialized member in SNC_io_parser.h 2020-11-22 09:39:22 +00:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Maxime Gimeno 42be4d9118 Add misisng header to off file 2020-10-27 12:58:47 +01:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Laurent Rineau 84ec799ca1 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-07-28 16:09:28 +02:00
Maxime Gimeno 213221e5cb Initialize eor to silent wranings 2020-07-24 14:02:40 +02:00
Sébastien Loriot 427298c9ba add a test for EPIC IO 2020-07-20 17:06:47 +02:00
Sébastien Loriot b1c09a5859 workaround to make it work with EPICK 2020-07-20 17:06:46 +02:00
Mael Rouxel-Labbé 6d6dc0c956 Fix a number of compilation issues 2020-06-24 17:41:20 +02:00
Thomas Krijnen a86712d1aa Don't segfault on empty Nef_nary_x 2020-06-07 15:25:18 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Laurent Rineau 7b601f4fde Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-04-19 14:54:19 +02:00
R.E. Wolff adb0b9d6f4 Merge branch 'master' of github.com:rewolff/cgal 2020-04-19 14:27:48 +02:00
R.E. Wolff ca7a9380b7 Fixed unusable error message 2020-04-19 14:27:22 +02:00
Sébastien Loriot 7c82e56f48 add missing cgalCite 2020-04-17 10:32:25 +02:00
albert-github e5177aa014 Introducing central MATHJAX_CODEFILE 
Currently the needed extra definitions for MathJax usage (i.e. `\newcommand` and `\def` commaonds) are distributed over the header file and in a number of source code files.
Doxygen has the possibility for a centralize this by means of the MATHJAX_CODEFILE configuration setting, this has been implemented.
 2020-04-13 12:37:57 +02:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +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
Laurent Rineau 2c5826dd6f Merge pull request #4474 from sloriot/CGAL-warning_macro 
Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
 2020-01-17 16:29:49 +01:00
Laurent Rineau fe91249ac4 Merge pull request #4474 from sloriot/CGAL-warning_macro 
Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
 2020-01-17 16:27:13 +01:00
Sébastien Loriot 4fbd1ed69c use CGAL_warning_msg instead of CGAL_warning to display a message 2020-01-16 14:14:13 +01:00
Laurent Rineau d19f79ee0d Merge pull request #4163 from MaelRL/T2-Throw_on_collinear_strongly_intersecting_segments-GF 
CDT2: Throw on constraint intersections that do not require constructions
 2019-12-05 11:05:47 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Sébastien Loriot 1bf02b2d94 remove license statements 2019-11-13 15:32:23 +01:00
Guillaume Damiand f42c9ab89d Update licences 2019-11-13 14:44:45 +01:00
Guillaume Damiand 7d2cf8df71 Bugfix in draw nef3 2019-11-13 14:38:22 +01:00
Guillaume Damiand d638c80b5a
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-11-12 22:13:10 +01:00
Laurent Rineau 30b02eea63 Merge pull request #4303 from sloriot/CGAL-SPDX_updates 
Update SPDX tags
 2019-10-25 16:26:13 +02:00
Constantinos Chamzas a55b90ef2a Namespaced newell function 2019-10-22 11:31:09 -05: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 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
Mael Rouxel-Labbé e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +02:00
Guillaume Damiand 2b381af544 Remove more warnings 2019-09-16 17:19:49 +02:00
Jasmeet Singh 63d1838b60 Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet 2019-07-23 12:27:41 -07: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
Jasmeet Singh b188dabef4 Small Environment variable fix. 2019-07-12 11:45:55 -07:00
Jasmeet Singh a943d8e479 Specialize draw() function for Nef_3 viewer 2019-07-12 11:12:57 -07:00
Jasmeet Singh a542fbdb45 Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet and resolve conflicts 2019-07-10 11:48:38 -07:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Jasmeet Singh 09fcb98c65 Add the documentation header file draw_nef_3.h 2019-07-03 15:19:25 -07:00
Jasmeet Singh ff2a498d9e Add documentation for Nef Polyhedron Viewer. 2019-07-03 15:06:13 -07:00
Jasmeet Singh 53bed9f541 Clean up draw_nef_3 example 2019-07-03 13:57:51 -07:00
Jasmeet Singh e5986189a5 Correct vertex normals. Gourard Shading works. 2019-07-03 13:53:08 -07:00
Jasmeet Singh ac5b76c0d1 Remove unused compute_vertex() method, display nef in one color 2019-07-02 16:35:53 -07:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Jasmeet Singh 16992e743e Add color to faces. Code cleanup 2019-06-29 19:12:43 -07:00
Jasmeet Singh 625ab7583d Count and tally the number of edges drawn for validation. 2019-06-29 18:08:07 -07:00
Jasmeet Singh f9690fb852 Add face normal computation. 2019-06-29 17:53:35 -07:00
Jasmeet Singh 5b19e7d1a5 Add debug output. Classify newell_single_step_3 function using namespace CGAL to avoid ambiguity. Add example file to draw. 2019-06-29 14:25:43 -07:00
Jasmeet Singh 42c09f550d Add viewer for faces of Nef Polyhedron. 2019-06-28 13:25:09 -07:00
Jasmeet Singh 9995083b9e Add a visitor class to view the elements of Nef Polyhedron. Only vertices viewed for now. 2019-06-28 11:44:52 -07:00
Jasmeet Singh 6843c2ed69 Add viewer for Nef Polyhedra. Only points viewed for now. 
File Buffer_for_vao.h modified to classify the ambiguous call to the function newell_single_step_3().
Added namespace identifier 'internal::' to avoid conflict with function in normal_vector_newell_3.h included in
Nef_polyhedron_3.h
 2019-06-27 12:44:38 -07:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +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 5dc823d509 Merge branch 'releases/CGAL-4.14-branch' 2019-05-23 08:49:56 +02:00
Laurent Rineau 7be5e3fbe5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-23 08:44:39 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé 0b506f5cce Fix package dependencies 2019-05-10 12:41:25 +02:00
Sébastien Loriot a84ff2d663 fix index order of triangles 2019-04-24 09:48:45 +02:00
Sébastien Loriot ca755e35a8 Merge pull request #3599 from maxGimeno/Nef_3-Document_Nef_3_to_Polygon_soup-GF 
Nef_3 : Document convert_nef_polyhedron_to_polygon_soup-GF
 2019-04-23 09:52:26 +02:00
Sébastien Loriot 28ec0d926d remove unused typedef 2019-04-12 17:52:31 +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 ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01: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 8ec090d1d1 remove condition for cpp11 in Nef 2019-03-29 10:41:50 +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
Andreas Fabri a77988e149 Fix Nef_3 2019-01-24 18:06:03 +01:00
Maxime Gimeno 2feb6c892b Remove the RandomAccessContainer constraint 2019-01-24 11:57:38 +01:00
Maxime Gimeno e2f2c63e76 Modifications after review 2019-01-23 11:25:00 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Andreas Fabri 09ae18b191 Fix Nef_3 2019-01-22 19:07:31 +01:00
Andreas Fabri 9fc58ff874 Fix SNC_sphere_map 2019-01-22 19:07:31 +01:00
Maxime Gimeno 18d9e72124 Fix doc and update CHANGES.md 2019-01-22 11:19:38 +01:00
Laurent Rineau 80717c6f41 Merge pull request #3406 from mglisse/cgal-public-dev/Number_types-boost_mp-glisse-2 
Support Boost.Multiprecision
 2019-01-18 16:37:49 +01:00
Maxime Gimeno 7a7098d009 Fix doc 2019-01-16 11:23:30 +01:00
Andreas Fabri d8f608fa51 fix Nef_3 2019-01-15 18:20:36 +01:00
Maxime Gimeno ce72dd895f First draft of the doc 2019-01-15 12:38:04 +01:00
Maxime Gimeno b939551b38 Don't hardcode vector but use a random access container in polygon_soup_to_polygon_mesh. 2019-01-15 12:17:49 +01:00
Maxime Gimeno 7bd7caa53c Replace vectors of points and polygons by ranges and write a test file. 2019-01-15 10:04:38 +01:00
Marc Glisse 06a91af2b9 Clean-up FT vs RT in testcase. 2018-12-22 11:05:07 +01:00
Sébastien Loriot 725e773bdd add nef to polygon soup 2018-12-20 09:31:52 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Marc Glisse 45e09a9340 Convert string to Lazy<rational> through rational instead of integer. 2018-10-15 15:42:56 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Andreas Fabri 991f3847e8 Do not include graph_traits_Polyhedron.h, properties_polyhedron.h and Polyhedron_iostream.h 2018-05-03 13:23:50 +02:00
Andreas Fabri 97ac4d5f51 Exploit that construct is variadic 2018-04-17 14:15:07 +01:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Andreas Fabri 0543a5ea18 Merge branch 'Nef_3_dependencies-GF' of github.com:afabri/cgal into Nef_3_dependencies-GF 2018-03-23 18:45:43 +01:00
Andreas Fabri f312a3736b Adress doxygen warning 2018-03-23 15:35:05 +01:00
Laurent Rineau 84d74978bf Fix dependencies 2018-03-22 17:39:04 +01:00
Andreas Fabri 3580a28a98 Move file from BGL to Nef_3 2018-03-22 16:54:54 +01:00
Laurent Rineau 4a7966d145 Merge pull request #2860 from lrineau/Installation-fix_check_headers-GF 
Fix CGAL_ENABLE_CHECK_HEADERS, again
 2018-03-09 18:39:26 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 182239d6b6
Merge branch 'master' into CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF 2018-03-06 16:49:30 +01:00
Jane Tournois 30e2fe0844 fix condition on _MSC_VER 2018-03-02 10:39:57 +01:00
Laurent Rineau f16b771a09
Fix the syntax error 2018-03-01 14:04:38 +00:00
Jane Tournois 646dfedaf3 since msvc 2017, these typedefs are valid 
and even needed when using /permissive-
 2018-02-28 11:52:49 +01:00
Andreas Fabri f7ba8ff4df Fix Box_intersection_d, Minkowski_sum_2, Nef_3, Surface_mesh, Straight_skeleton, Triangulation_3 2018-02-23 11:35:58 +00:00
Andreas Fabri eb526fc4f5 Replacements and suppress warnings in the test code 2018-02-20 13:10:38 +00:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF 
Deal with VC++ warnings of level /W4
 2018-02-19 14:27:06 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Andreas Fabri fa92aa49f7 Nef 2018-01-18 10:43:57 +00:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags 
Add SPDX License Identifier
 2017-11-15 16:48:27 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 97e8ea1794 remove extra space 2017-11-12 10:17:51 +01:00
Laurent Rineau 42052eea86 Run Nef_3 tests sequentially, because they share filenames for I/O 2017-10-30 17:24:13 +01:00
Laurent Rineau 4d0d588c90 Merge pull request #1989 from maxGimeno/Plugins_use_SM-Convex_decomposition-GF 
convex decomposition work with Surface_mesh_item
 2017-07-03 12:08:48 +02:00
Laurent Rineau 01fc5c3b33 Merge branch 'releases/CGAL-4.10-branch' 2017-06-16 11:45:45 +02:00
Laurent Rineau bececa63df Merge branch 'releases/CGAL-4.9-branch' into releases/CGAL-4.10-branch 2017-06-16 11:43:08 +02:00
Sébastien Loriot 1ca852bb87 fix Booleen operations with full/empty space 2017-06-07 09:36:09 +02:00
Maxime Gimeno 45edec15db Nef_plugin works with surface_mesh. 2017-05-29 12:12:31 +02:00
Andreas Fabri c81b707bfb Do not include graph_traits_{Polyhedron | Surface_mesh}.h 2017-04-24 19:17:43 +02:00
Sébastien Loriot 4cbb19ecf4 remove unused variable warnings 2017-01-30 07:22:48 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files 
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
 2017-01-19 15:20:25 +01:00
Maxime Gimeno a01593e0bb Unify the links to the Polyhedron demo in the package descriptions. 2017-01-10 14:56:52 +01:00
Sébastien Loriot cad6cbbcf4 fix doc issues detected by recent doxygen 
duplicated labels, missing bibtex entry and nested comments
 2016-12-28 13:59:45 +01:00
Laurent Rineau 0db03b9b7c Merge pull request #1627 from mglisse/Number_types-gmpxx_IO2-glisse 
I/O for Lazy_exact_nt<mpq_class>
 2016-11-03 11:03:39 +01:00
Sébastien Loriot 117ea03d92 add missing include directives 2016-10-31 14:51:32 +01:00
Marc Glisse 883b1b8b66 Name the istringstream. 
operator>> on temporary istream requires C++11...
 2016-10-29 23:22:24 +02:00
Marc Glisse 9c16c39f5b Don't construct a number from a string. 
Lazy_exact_nt<mpq_class> is not currently constructible from
std::string. Use I/O functions instead.
 2016-10-27 22:05:41 +02:00
Laurent Rineau c826500c7d Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse 
Misc GMPXX fixes
 2016-10-20 09:47:39 +02:00
Laurent Rineau b76e1e021a Merge pull request #1470 from sloriot/Nef_3-cst_from_FaceGraph 
Add a Nef_3 constructor from a FaceGraph
 2016-10-17 10:03:28 +02:00
Laurent Rineau 5ab5825013 Merge pull request #1466 from sloriot/BGL-add_nef_to_pm 
Add a function to convert a Nef polyhedron to a polygon mesh
 2016-10-17 10:03:24 +02:00
Laurent Rineau 038a310a1a Merge pull request #1446 from sloriot/CGAL-remove_dont_submit 
Getting rid of the remaining dont_submit files
 2016-10-17 10:01:30 +02:00
Laurent Rineau 2e4354f2e6 Merge pull request #1421 from afabri/Nef_3-static-GF 
Nef_3: Make variables atomic
 2016-10-17 09:59:36 +02:00
Marc Glisse 5bee5f5922 Workarounds for expression templates. 2016-10-15 18:21:54 +02:00
Marc Glisse 030d81e3f7 Fixes for FT=mpq_class. 
In particular, the constructor from std::string is explicit.
test_nef_3_io_EPEC is still broken because of that.
 2016-10-14 00:37:11 +02:00
Sébastien Loriot 74c66cc44d add missing example 2016-10-10 16:44:24 +02:00
Sébastien Loriot b572d76f16 move unused files to archive 2016-10-06 09:53:36 +02:00
Andreas Fabri 66fb38611d no need for CGAL/tss.h 2016-10-05 16:15:49 +02:00
Sébastien Loriot d9413be399 add function convert_nef_polyhedron_to_polygon_mesh and document it 2016-10-05 15:28:12 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF 
Compute and fix packages dependencies
 2016-10-05 13:11:04 +02:00
Andreas Fabri bc8e29b025 Split the file CGAL/Nef_3/ID_support_handler in two files, 
one with the generic function, one with the specialization used by Nef_3.
 2016-09-30 15:23:15 +02:00
Laurent Rineau c22dcd0e2c Missing includes 2016-09-30 15:23:15 +02:00
Andreas Fabri b571c968ed Fix package Nef_3: include headers 2016-09-30 15:22:30 +02:00
Laurent Rineau 3ba403471c Use CGAL::cpp11::atomic only when possible 2016-09-22 15:38:02 +02:00
Sébastien Loriot f1f82785ac add a constructor from a FaceGraph 
The first version code is from @afabri
 2016-09-21 08:47:06 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Andreas Fabri 0695aa3fcd Protect a counter shared by all threads using atomic 2016-09-06 11:18:22 +02:00
Andreas Fabri 099b98da01 Make variables thread local 2016-08-31 12:56:46 +02:00
Sébastien Loriot 013c25c889 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-06-08 14:11:28 +02:00
Sébastien Loriot 683e6dff94 handle isolated vertices in change_orientation 2016-06-07 10:04:43 +02:00
Laurent Rineau 50b55bd27c Merge pull request #890 from sloriot/CGAL-generate_CMakeLists-sloriot 
Generate CMakelists
 2016-03-29 11:02:17 +02:00
Laurent Rineau 00e6e03d5c Merge pull request #785 from afabri/CGAL-missing_includes-GF 
Partial cleanup of issue #595   Part2
 2016-03-24 17:02:27 +01:00