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
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
5efce459da
Mesh_3
2018-01-18 08:49:52 +00:00
Andreas Fabri
cbf3a16471
libs compile without warning
2018-01-17 15:02:32 +00:00
Laurent Rineau
af2a4473df
Fix compilation on CentOS6 (older Boost)
2017-12-12 12:52:25 +01:00
Laurent Rineau
2481043d6c
Merge branch 'master' into Polyhedron_demo-update_SEP_reader-GF
2017-12-11 13:58:17 +01:00
Laurent Rineau
3c6640bf59
Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
...
Renewal of CMake scripts: header-only, ctest, CMake>=3.1
# Conflicts:
# Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau
a752da3a28
Update the SEP reader
2017-12-04 16:40:58 +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
Laurent Rineau
3ff09bc549
Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
...
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Laurent Rineau
86fb40832a
Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
...
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau
c6068691fa
Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
...
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Sébastien Loriot
0698f79aff
add SPDX identifier for files under the LGPL-3+ license
2017-11-12 10:17:50 +01:00
Laurent Rineau
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau
030c7c2291
Fix test/CGAL_ImageIO/test_trilinear_interpolation.cpp with CTest
2017-10-24 11:46:03 +02:00
Laurent Rineau
7e9f756935
Replace all std::unary_function by CGAL::unary_function
2017-10-04 15:57:09 +02:00
Laurent Rineau
8dfa4f4dc8
Fix link error of demo/Polyhedron, in Debug and CGAL_HEADER_ONLY
2017-07-27 17:28:21 +02:00
Laurent Rineau
92d9f6f63b
Force 53 bits of precision
...
Tries to fix the runtime error:
```
test_trilinear_interpolation: /home/cgal_tester/build/src/cmake/platforms/Fedora-32-Release/test/CGAL_ImageIO/test_trilinear_interpolation.cpp:110: int main(): Assertion `value2 == value3' failed.
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.11-Ic-71/CGAL_ImageIO/TestReport_lrineau_Fedora-32-Release.gz
2017-07-21 09:54:10 +02:00
Maxime Gimeno
5ae96fc2aa
Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found.
2017-05-23 16:12:56 +02:00
Laurent Rineau
429bfa4315
move the add_config_flag calls
2017-03-27 17:23:26 +02:00
Laurent Rineau
ff15d0e5fc
Simplify the CMakeLists.txt of our libraries
2017-03-27 17:23:26 +02:00
Maxime Gimeno
cf3952afe8
Fix warning
2016-11-18 12:18:24 +01:00
Maxime Gimeno
b01999b634
Add support for SEP images to the Io_image_plugin
2016-11-07 14:05:06 +01:00
Andreas Fabri
6042496f58
one more fallthrough
2016-10-18 11:13:59 +02:00
Andreas Fabri
c90f4bf978
more fallthrough statements
2016-10-17 13:45:42 +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
Maxime Gimeno
2f7ccf76eb
Upgrades :
...
- The dialog won't let the user create an image if its size doesn't match the file's
- the offset is counted in the images's size
- the fields of the dialog have tooltips
- If the raw_image has a WK_FLOAT, the image is automatically detected as gray-level
- Images can be saved in .inr.gz
Remaining : convert images to the right format to be meshed when asked to.
2016-10-06 11:46:00 +02:00
Sébastien Loriot
8b0243bafd
move demo to archive
2016-10-06 09:53:37 +02:00
Laurent Rineau
7b6addbb55
Merge pull request #1519 from lrineau/Mesh_3-fix_conversion_warnings-lrineau
...
Mesh_3: fix conversion warnings
2016-10-05 13:03:15 +02:00
Laurent Rineau
9a0bb54922
Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
...
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +02:00
Laurent Rineau
7dbc756d42
Mesh_3: Fix other conversion warnings
2016-09-29 14:39:11 +02:00
Laurent Rineau
dc3c7a5c1c
better _readImage_raw()
2016-09-16 17:07:13 +02:00
Laurent Rineau
d99266ac17
Also show the offset coordinates (tx, ty, tz)
...
trivial enhancement
2016-09-13 12:06:55 +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
e78bef8a9c
update project name of demos
2016-09-08 00:13:34 +02:00
Sébastien Loriot
6b338eeb1f
improve the name of projects in cmake scripts of examples
2016-09-08 00:02:55 +02:00
Clement Jamin
7ca2c758da
Fix warnings in CGAL_ImageIO
2016-07-01 11:27:54 +02:00
Laurent Rineau
1cde972cdb
Remove whitespace at end of lines
2016-06-29 11:04:29 +02:00
Guillaume Damiand
e715a25483
Move header files of ImageIO from directory CGAL_ImageIO/src/ to directory CGAL_ImageIO/include/CGAL/ImageIO/; update #include accordingly.
2016-06-28 19:18:53 +02:00
Guillaume Damiand
71d9047b87
Move add_definition before collect cgal library (bugfix)
2016-06-28 12:46:22 +02:00
Guillaume Damiand
6820e1b5c4
Reorder the cmake directive to retreive the same original order
2016-06-28 11:30:18 +02:00
Sébastien Loriot
32ea637e4b
fix error introduced while fixing conflicts in 10cadcb9
2016-06-27 18:14:47 +02:00
Guillaume Damiand
e02ac7f7f0
Remove link with zlib (that we introduced before but which are no more required)
2016-06-24 18:35:37 +02:00
Sébastien Loriot
10cadcb985
Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD
2016-06-24 17:05:40 +02:00
Sébastien Loriot
c951fe0fca
Merge pull request #1035 from lrineau/CGAL-fix_Wconversion_warnings-GF
...
Fix -Wconversion warnings, and issues detected by those warnings
2016-06-24 13:30:48 +02:00
Guillaume Damiand
5b000f38c6
Install header files of cgal_imageio in CGAL_ImageIO/include/CGAL/ImageIO/ directory (following Laurent remark)
2016-06-24 11:02:01 +02:00
Guillaume Damiand
e21ef313c0
Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin
2016-06-22 20:54:37 +02:00
Guillaume Damiand
8b803aca6f
Install header files of CGAL_ImageIO/ when we are in header only mode.
2016-06-22 15:57:57 +02:00
Sebastien Loriot
749e40fce9
Merge pull request #1115 from lrineau/Mesh_3-connected_components_for_images-GF
...
Mesh_3: connected components for 3D images
2016-06-22 14:52:10 +02:00
Guillaume Damiand
50125f1d53
First try to use an interface target in header only; in order to allow to link with this fictive target.
2016-06-22 13:44:50 +02:00
Sébastien Loriot
d5cd488b8b
remove functions using the deprecated direct draw mode in ImageIO
2016-06-21 09:55:07 +02:00
Guillaume Damiand
374f5cc785
More link with zlib
2016-06-18 07:59:35 +02:00
Laurent Rineau
312aee625a
New overloads of CGAL::IMAGEIO::static_evaluate()
2016-06-15 18:10:14 +02:00
Clement Jamin
f354c0187e
Minor improvement
2016-06-15 17:59:35 +02:00
Clement Jamin
3b61a9d611
Fix types
2016-06-15 17:51:23 +02:00
Clement Jamin
dfc9a2f04b
writeGisHeader now returns a boolean
2016-06-15 12:01:35 +02:00