Commit Graph

290 Commits

Author SHA1 Message Date
Jane Tournois 83c40f2c34 fix return type 2021-06-21 09:54:48 +02:00
Laurent Rineau 91d66354f2 Merge pull request #5769 from alefy/ImageIO-Fix_inline_vtk-alefy
Add inline vtk_image_sharing_same_data_pointer
2021-06-16 15:04:45 +02:00
Adrien Lefieux 9723f5e68e Add inline vtk_image_sharing_same_data_pointer
Fix possible duplicate symbol.
2021-06-08 17:38:27 +02:00
Laurent Rineau 26ad68e486 Merge pull request #5649 from sloriot/CGAL-no_boost_shared_ptr
Replace internal use of boost shared_ptr
2021-05-18 18:14:12 +02:00
Sébastien Loriot 22be8671f7 move read_vtk_image_data to IO 2021-05-04 14:59:28 +02:00
Sébastien Loriot 1faa0e2992 replace internal use of boost::shared_ptr by std::shared_ptr 2021-04-28 10:55:26 +02: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
Sebastien Loriot 7b88b9adc3
Merge pull request #5582 from lrineau/CGAL_ImageIO-add_an_example_and_restore_VTK_support-GF
CGAL ImageIO: Add an example and restore VTK support
2021-04-17 10:54:18 +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
Laurent Rineau b6d0c086ef Fix for the testsuite 2021-04-13 11:33:32 +02:00
Laurent Rineau ab1c30a9a5 Add support for tx/ty/tz (the origin) in Image_3_vtk_interface.h 2021-04-02 12:06:20 +02:00
Laurent Rineau 0f2bcf2aa6 Fix the CMakeLists.txt for image_to_vtk_viewer.cpp 2021-04-02 12:05:44 +02:00
Laurent Rineau c5334e5d25 Fix a typo 2021-04-02 12:04:30 +02:00
Laurent Rineau 6380e07553 Add an example for CGAL ImageIO 2021-04-02 12:02:33 +02:00
Maxime Gimeno d5811d0a41 clang-tidy on tests 2021-02-18 15:15:12 +01:00
Maxime Gimeno 2255f8e8ea Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno 2021-01-13 14:34:09 +01:00
Maxime Gimeno 2ad4c16b6e Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-26 15:00:53 +01:00
Raphael Grimm 6acef1b8b1 Fix define clashes with dirent.h which is included by some boost headers
Use prefix CGAL_analyze_impl_ to avoid clashing and breaking dirent.h.
Also fix potential bug when including
"CGAL/Classification/TensorFlow/Neural_network_classifier.h"
after this header
2020-10-20 14:18:12 +02:00
Raphael Grimm bdecbc9511 Rename the define DEBUG to CGAL_GIF_IMPL_DEBUG
Having such a general term defined in a header can cause issues in downstream projects (e.g. if DEBUG is used as member of an enum).
2020-10-16 10:47:54 +02:00
Maxime Gimeno 107c4350d0 remove all /src directories 2020-10-14 11:22:49 +02:00
Maxime Gimeno 2ed89ef35e simplify CGAL_setup dependencies. 2020-10-12 12:24:13 +02:00
Maxime Gimeno 39f97ca56b remove NOT CGAL_HEADER_ONLY 2020-10-05 15:44:05 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02: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
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
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