Commit Graph

217 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 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 cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Sebastien Loriot 715e8e3e8b
fix leak
Co-Authored-By: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-02-27 10:52:23 +01:00
Sébastien Loriot 844bfddcac avoid crash if the file is corrupted or empty 2020-02-27 10:19:35 +01:00
Sebastien Loriot 230850220e
Merge pull request #4396 from janetournois/Polyedron_demo-fix_image_io-jtournois
ImageIO and Polyhedron demo - Add error message when `io_image_plugin` can't save
2019-12-20 09:46:07 +01:00
Jane Tournois adeb6b391e add error message
when zlib version is < 1.2.9, it is not possible to save an image as .inr,
it has to be .inr.gz
no matter if zlib is available or not

this commit adds an error message to help the user understand the error
2019-12-05 16:29:11 +01:00
Sébastien Loriot 28185b55e4 fix warning
stduol returns an unsigned long
2019-11-11 13:41:09 +01:00
Laurent Rineau 436d5cba52 Merge pull request #4326 from lrineau/ImageIO-fix_warnings-lrineau
ImageIO: fix warnings
2019-11-06 17:45:28 +01:00
Laurent Rineau 5e1fe8a0b0 fix warnings 2019-10-29 15:39:57 +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
Laurent Rineau 5d1704b9d1 Fix typo 2019-10-24 09:29:16 +02:00
Laurent Rineau b9c8736d29 Missing #include for stoul 2019-10-21 16:37:31 +02:00
Sébastien Loriot 6c32bf4e4a Remove license notice in src ImageIO 2019-10-19 16:13:23 +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 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 8cffe1e8e7 Check if spacings are null when reading a vtk image. If they are, set them to 1. 2019-10-03 16:36:20 +02:00
Laurent Rineau 084d534949 Fix conversion warnings in the Surface_mesher testsuite 2019-09-04 10:36:17 +02:00
Laurent Rineau 64bc3bc96e Fix conversion warnings of the testsuite of CGAL_ImageIO 2019-09-04 10:22:46 +02:00
Laurent Rineau dc4e41c13e Fix the code of extract_a_sub_image, conversion warnings 2019-09-04 10:22:27 +02:00
Laurent Rineau eaef60dcfc Add a new tool extract_a_sub_image.cpp to extract a sub-image 2019-07-24 14:33:20 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +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 e4aaf2447c Fix the use of offset in Labeled_mesh_domain_3 2019-06-18 15:50:15 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +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 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Laurent Rineau 99883c4b6a Fix a [-Wformat-overflow=] warning
.../CGAL_ImageIO/include/CGAL/ImageIO_impl.h: In function ‘_image* _readImageHeaderAndGetError(const char*, int*)’:
.../CGAL_ImageIO/include/CGAL/ImageIO_impl.h:1082:12: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
 1082 |     fprintf(stderr, "_readImageHeaderAndGetError: error: unable to open file \'%s\'\n", name);
      |     ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2019-02-08 09:33:50 +01:00
Laurent Rineau 026868a294 Merge pull request #3552 from lrineau/Image_IO-Image_3_maybe_not_own_the_data-GF
Add a non-documented API, to allow CGAL::Image 3 not to own its data
2019-01-22 09:15:15 +01:00
Laurent Rineau 8121e872ab Merge pull request #3513 from sloriot/CGAL-fix_maybe_uninit_vars_wrngs_2
Fix some wmaybe-uninitialized warnings
2018-12-19 16:08:55 +01:00
Laurent Rineau 166606cab3 Secret API to allow Image_3 not to own its data 2018-12-17 15:17:44 +01:00
Laurent Rineau 163becbe04 Merge branch 'releases/CGAL-4.13-branch' 2018-12-17 11:51:35 +01:00
Maxime Gimeno 7a04091d4a Add offset from vtk 2018-12-12 14:31:50 +01:00
Laurent Rineau cbd4d97998 Fix a [-Wconversion] warning 2018-12-11 10:31:55 +01:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +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
Maxime Gimeno a50b224fc2 Protect new code with preprocessor checks 2018-07-27 14:21:07 +02:00
Maxime Gimeno 1d958dbd54 Fix .inr writing without zlib 2018-07-26 12:08:11 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Andreas Fabri 777d3057d9 Undef the macros at the end, as they are not identical (one has an EXPORT) 2018-05-23 11:48:58 +02:00
Laurent Rineau fd49c82abd Fix warnings 2018-05-15 15:13:05 +02:00
Laurent Rineau e46cd8ad1a Remove the last -Wconversion warnings from all Mesh_3
I have only compiled tests and examples. Maybe the Mesh_3 plugin of the 3D
demo has other warnings.
2018-05-15 15:13:04 +02:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00