Commit Graph

87919 Commits

Author SHA1 Message Date
Sébastien Loriot 6c32bf4e4a Remove license notice in src ImageIO 2019-10-19 16:13:23 +02:00
Sébastien Loriot 1ef976e3a5 Remove license notice from libQGLviewer forked files 2019-10-19 16:09:56 +02:00
Sébastien Loriot c4c1a0b317 Remove license notice in headers manually 2019-10-19 16:00:05 +02:00
Sébastien Loriot 07c4ada6ec update SPDX flags and remove license notice of ImageIO files 2019-10-19 15:50:09 +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
Mael Rouxel-Labbé defeee0d86 Merge branch 'CGAL-Header_only_doc_rewrite-GF-old' into CGAL-Header_only_doc_rewrite-GF 2019-10-19 13:06:45 +02:00
Sébastien Loriot 4788398628 add notice for commercial license 2019-10-19 12:23:05 +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 1c829dcb08 remove extra space 2019-10-18 22:04:37 +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 282e01c432 update SPDX tag to new version
old tags being deprecated
2019-10-18 21:48:06 +02:00
Laurent Rineau 708d022849 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-10-18 14:29:11 +02:00
Laurent Rineau 7acfdff7d5
SMSP: fix border and robustness issues (#3977)
SMSP: fix border and robustness issues

Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2019-10-18 14:24:42 +02:00
Laurent Rineau f8fc874eeb Merge branch 'releases/CGAL-4.14-branch' 2019-10-18 14:18:28 +02:00
Laurent Rineau 2edcf7b033 Merge pull request #4269 from maxGimeno/PMP-Fix_doc_macro-maxGimeno
PMP: Fix doc macro
2019-10-18 14:17:19 +02:00
Laurent Rineau 7cb06cfd42 Merge pull request #4276 from MaelRL/SMP-ARAP_improvements-GF
SMP: Various improvements to the ARAP parameterizer
2019-10-18 14:17:17 +02:00
Laurent Rineau be0c21cfa4 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components
2019-10-18 14:17:15 +02:00
Laurent Rineau 59398afe51 Merge pull request #4282 from sloriot/CGAL-doc_style_issue
Fix doc style issue
2019-10-18 14:17:12 +02:00
Laurent Rineau d1c55a6915 Merge pull request #4283 from sloriot/SMSeg-more_robust
Be more robust to degenerate and almost degenerate faces
2019-10-18 14:17:10 +02:00
Laurent Rineau 95fecfc784 Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF
Fix CMake scripts for installed header-only version of CGAL
2019-10-18 14:17:08 +02:00
Laurent Rineau 421a98cd95 Merge pull request #4292 from maxGimeno/CGAL_Config-Fix_typo-maxGimeno
Remove extra S in macro
2019-10-18 14:17:05 +02:00
Sébastien Loriot 51d1c58b46 more updates 2019-10-18 10:01:05 +02:00
Sébastien Loriot 90b199b952 fix typos 2019-10-18 09:40:01 +02:00
Sébastien Loriot 71cb5d2ccd mention vcpkg doc 2019-10-18 09:27:57 +02:00
Laurent Rineau c69c604f1f Merge remote-tracking branch 'refs/remotes/cgal/master' 2019-10-17 21:00:28 +02:00
Sébastien Loriot bbfb23181e pass on the doc 2019-10-17 15:02:47 +02:00
Sébastien Loriot 76cc4a6863 pass on the doc 2019-10-17 14:36:00 +02:00
Sébastien Loriot dd00593e86 add a comment 2019-10-16 23:53:59 +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 5ad86b83c6 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
Do not require -DCGAL_HEADER_ONLY
2019-10-16 18:04:33 +02:00
Laurent Rineau ac1b7ec61a Fix CGAL_Qt5 in non-header-only 2019-10-16 18:02:26 +02:00
Laurent Rineau d2cdc3c945 Merge pull request #4288 from MaelRL/SMSP-robustify-5.0-GF
SMSP: fix border and robustness issues (5.0)
2019-10-16 16:24:26 +02:00
Maxime Gimeno a67361fe45 Add ranges 2019-10-16 11:39:40 +02:00
Maxime Gimeno 74db722b96 fixes after review + new batch of transformations 2019-10-16 11:04:40 +02:00
Mael Rouxel-Labbé 5c025271d9 Merge branch 'SMSP-fix_border_vertices' into SMSP-robustify-5.0-GF 2019-10-16 09:36:11 +02:00
Mael Rouxel-Labbé df6568f733 Fix bad copy paste 2019-10-16 09:35:48 +02:00
Mael Rouxel-Labbé 423c5961e2 Merge branch 'SMSP-fix_border_vertices' into SMSP-robustify-5.0-GF 2019-10-16 09:33:54 +02:00
Mael Rouxel-Labbé e4e63e087b Remove leftover expensive assertion 2019-10-16 09:33:33 +02:00
Mael Rouxel-Labbé 09e563c73f Fix a "potentially uninitialized" warning 2019-10-16 09:33:29 +02:00
Laurent Rineau 8d7932cdc2 Merge pull request #4203 from maxGimeno/Demo-Fix_detect_boundaries-GF
Polyhedron Demo: Fix  stitching plugin
2019-10-15 16:34:14 +02:00
Laurent Rineau 2caae76bc5 Merge pull request #4262 from MaelRL/PMP-Fix_missing_images_and_history-GF
PMP (and changelog): Fix misc errors in 5.0-beta1
2019-10-15 16:34:11 +02:00
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
Do not require -DCGAL_HEADER_ONLY
2019-10-15 16:34:09 +02:00
Laurent Rineau c58815d7c7 Merge pull request #4269 from maxGimeno/PMP-Fix_doc_macro-maxGimeno
PMP: Fix doc macro
2019-10-15 16:34:06 +02:00
Laurent Rineau b20f0ff8b9 Merge pull request #4270 from maxGimeno/PMP-Fix_doc_macro-5.0-maxGimeno
PMP: Fix doc macro-master
2019-10-15 16:34:03 +02:00
Laurent Rineau 868372e89b Merge pull request #4272 from jasjuang/master
fix Mpfz default constructor causes unreachable code warning in Visual Studio
2019-10-15 16:34:00 +02:00
Laurent Rineau 6245c45bd7 Merge pull request #4273 from maxGimeno/Demo-Fix_DICOM_reading-maxGimeno
CGAL 3D Demo: Fix DICOM display
2019-10-15 16:33:58 +02:00
Laurent Rineau 38539d9a70 Merge pull request #4276 from MaelRL/SMP-ARAP_improvements-GF
SMP: Various improvements to the ARAP parameterizer

# Conflicts:
#	Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
2019-10-15 16:33:47 +02:00