Commit Graph

52 Commits

Author SHA1 Message Date
Andreas Fabri 939002b1ec Add functions that enable to change the origin 2023-05-02 13:09:47 +01:00
Mael Rouxel-Labbé 0f0bd3ff6d WIP bmp reading 2022-11-25 01:04:45 +01:00
Sébastien Loriot 4ffc949199 replace boost::unordered by std::unordered
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +01:00
Laurent Rineau ca89949169 Merge pull request #5597 from lrineau/Mesh_3-weighted_images-GF
Mesh_3: Add weighted images
2021-10-29 17:01:33 +02:00
Sébastien Loriot 44df66485d move images 2021-10-07 14:47:15 +02:00
Jane Tournois 4b3fee813f ITK is not needed in c3t3_item, and find with the required components only 2021-09-23 14:46:40 +02:00
Jane Tournois 6be3be61de make constructor explicit to avoid implicit conversions
that would also take the own of the data in `im`
2021-09-23 10:47:20 +02:00
Jane Tournois 89a227af80 make 'weights' a boost named parameter of create_labeled_image_mesh_domain() 2021-06-25 17:09:32 +02:00
Jane Tournois 83c40f2c34 fix return type 2021-06-21 09:54:48 +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
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 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
Laurent Rineau 64bc3bc96e Fix conversion warnings of the testsuite of CGAL_ImageIO 2019-09-04 10:22:46 +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 e4aaf2447c Fix the use of offset in Labeled_mesh_domain_3 2019-06-18 15:50:15 +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 166606cab3 Secret API to allow Image_3 not to own its data 2018-12-17 15:17:44 +01:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +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
Andreas Fabri 5efce459da Mesh_3 2018-01-18 08:49:52 +00: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 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +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
Laurent Rineau 7dbc756d42 Mesh_3: Fix other conversion warnings 2016-09-29 14:39:11 +02:00
Sébastien Loriot d5cd488b8b remove functions using the deprecated direct draw mode in ImageIO 2016-06-21 09:55:07 +02:00
Laurent Rineau f63605355a Bug-fix in Image_3::labellized_trilinear_interpolation
The 'value_outside` was not correctly used.
2016-04-20 15:25:06 +02:00
Laurent Rineau 36ee6cc30b Renaming: Target_word_type->Target_type
The target type may be a floating point type. Strange to call it a "word".
2016-04-20 15:16:04 +02:00
Laurent Rineau e8bd026dd0 Fix Image_3
The value outside must be 0. in the trilinear interpolation of indicator
functions.
2016-04-19 12:24:30 +02:00
Laurent Rineau 81e53df5f1 Fix a pedantic error 2016-04-19 12:24:17 +02:00
Laurent Rineau 35cb7bd5b8 Improve CGAL::Image_3
- The type of `value_outside` is now directory `Return_type`: no need to
  apply the transformation.

- The indicator functions of the labelized trilinear interpolation can
  be changed.
2016-04-14 19:36:20 +02:00
Andreas Fabri 143fcd3b52 Only interpolate for existing labels 2016-03-03 10:35:33 +01:00
Andreas Fabri 1fa552c1cb Explain usage when called without arguments 2016-01-13 16:16:33 +01:00
Andreas Fabri 57ad151cd4 ImageIO no longer depends on VTK
* The non-documented WITH_VTK is no longer supported.
* The function CGAL::Image_3::read_vtk_image_data
  has been replaced by a global function.
* Added Mesh_3/examples/Mesh_3/mesh_3D_gray_vtk_image.cpp
2016-01-13 15:50:54 +01:00
Sébastien Loriot dd955cef30 Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau'
Mesh 3 : add gray level image oracle
2015-12-18 16:46:46 +01:00
Andreas Fabri c5ee0a9139 Include missing header 2015-12-08 11:25:00 +01:00
Andreas Fabri 0a1ecead08 Do not use a std::set to find the at most 8 different labels 2015-12-06 18:44:05 +01:00
Jane Tournois 3f308a48af Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau 2015-11-17 11:16:53 +01:00
Jane Tournois 745a4f0288 Revert "fix conversion warning"
This reverts commit 74e5117dfb.
2015-10-13 12:38:16 +02:00
Jane Tournois 74e5117dfb fix conversion warning 2015-10-13 12:06:26 +02:00
Guillaume Damiand 7457fc2fc7 Replace #include name 2015-03-16 21:17:42 +01:00
Guillaume Damiand a4afce92b6 Image_3, ImageIO, vmpendian and fgets 2015-03-16 16:11:01 +01:00
Jane Tournois 9c4038d267 add consistency in the use of size_t everywhere 2014-11-13 11:13:35 +01:00
Jane Tournois 06eb921215 fix the use of integers
patch suggested by Bryn Lloyd on cgal-discuss to avoid an integer overflow
problem that occurs when generating a 3D mesh from very large images
2014-10-20 12:39:03 +02:00
Clement Jamin f19c4b29d8 Fix MSVC warnings 2014-07-03 16:18:48 +02:00
Laurent Rineau 3f9df99964 Partially revert the commit 455190a2e4
The commit 455190a2e4 contains debugging code
that should have never being commited (and does not compile if
CGAL_USE_ZLIB is not defined).
2013-03-18 15:40:29 +01:00
Andreas Fabri 455190a2e4 removed one parameter too much 2013-03-01 08:55:10 +01:00