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

372 Commits

Author SHA1 Message Date
oboes 401d266a07 Fix error in HSV/RGB color conversion 2020-08-23 05:55:48 +02:00
Sébastien Loriot a13b96220f Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-08-07 06:41:47 +02:00
Sébastien Loriot c8b73c9f01 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2020-08-07 06:40:23 +02:00
Sébastien Loriot 4a1ad0c756 remove incorrect license include statement 2020-08-06 11:45:23 +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
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
Sebastien Loriot 0c8e9cb0c1
Merge pull request #4212 from maxGimeno/Demo-Save_the_scene_entirely-maxGimeno 
CGAL 3D Demo: Enhancement of the Scene Saving System
 2020-03-16 16:35:45 +01:00
Maxime Gimeno d8fd359399 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2020-02-24 16:41:34 +01:00
Laurent Rineau 28f5b1e783 Fix CMake syntax error in previous commit 
@maxGimeno Please test your commits.
 2020-02-19 16:59:39 +01:00
Maxime Gimeno 310be1cf6b update test's CMakeLists 2020-02-19 13:46:11 +01:00
Maxime Gimeno c85c7ea6e9 rephrase \attention 2020-02-19 13:45:02 +01:00
Maxime Gimeno 6719b0db89 Add checks and doc for version < 2 2020-02-18 10:52:16 +01:00
Maxime Gimeno b59e55731c add misisng namespace 2020-01-13 10:30:33 +01:00
Maxime Gimeno 94bbd715ab Remove test of unexisting functions 2020-01-09 14:57:22 +01:00
Maxime Gimeno 6c35826afd Fixes and apply to multipolygon 2020-01-03 10:51:19 +01:00
Maxime Gimeno 4c36c04fd6 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2019-12-19 11:26:55 +01:00
Andreas Fabri 9a330fd140 Stream_support: Fix reading WKT POLYGON 2019-12-05 16:17:37 +01:00
Sébastien Loriot b9a079b530 remove cpp11/cpp0x 2019-11-04 11:34:53 +01:00
Sébastien Loriot 9a0bff4008 remove BOOST_FOREACH added by recent PRs 2019-11-04 10:59:15 +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 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
Maxime Gimeno af5773cf4e Integration of WS Server to the demo. Sessions handled and Remove the point_sets and polylines management from the 3mf plugin 2019-09-26 14:59:36 +02:00
Sebastien Loriot eb712a67e9
Merge pull request #4094 from MaelRL/PMP-Snap_pp-GF 
PMP: speed improvements for snap.h
 2019-08-12 09:02:50 +02:00
Maxime Gimeno 2698704f87 Add vertex nomals in write_OBJ for Surface_mesh 2019-07-29 15:55:38 +02:00
Mael 9ba0870ebd
Merge branch 'master' into PMP-Snap_pp-GF 2019-07-18 17:43:04 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master 
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
 2019-07-18 17:05:25 +02:00
Sebastien Loriot e4adb62011
Merge pull request #4078 from maxGimeno/Fix_some_warnings-GF 
Fix warnings
 2019-07-18 16:35:51 +02:00
Sebastien Loriot fbf6fb375d
Merge pull request #4050 from sgiraudot/Surface_mesh-Fix_PLY_warning-GF 
[Surface Mesh / PLY] Fix uninitialized warning and error on unhandled properties
 2019-07-18 16:31:17 +02:00
Mael Rouxel-Labbé f0b1052732 Add missing header includes 2019-07-18 15:54:32 +02:00
Maxime Gimeno 64253458aa Fix warnings 2019-07-12 10:49:10 +02:00
Liangliang Nan a9fd80cc7a Update Stream_support/include/CGAL/IO/PLY.h 
Replace <boost/property_map/property_map.hpp> by <CGAL/property_map.h>

Co-Authored-By: Sebastien Loriot <sloriot.ml@gmail.com>
 2019-07-08 10:28:44 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Simon Giraudot a712713111 Fix uninitialized warning 2019-07-03 09:58:37 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF 
CMake>=3.13: opt for for new policies up to 3.15
 2019-07-01 11:16:30 +02:00
Liangliang Nan 655fa4b30d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-25 14:23:17 +02:00
Laurent Rineau 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF 
Stream_support: Add a 3mf wrapper
 2019-06-20 14:21:11 +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
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +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
Maxime Gimeno 86ca13a388 change behavior when soup is not orientable in the demo. 2019-06-17 14:11:32 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF 
Replace NULL and Nullptr_t with nullptr and nullptr_t
 2019-06-17 14:10:35 +02:00
Maxime Gimeno c5174f693c Rename soup function 2019-06-17 14:07:27 +02:00