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
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
a752da3a28
Update the SEP reader
2017-12-04 16:40:58 +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
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
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
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
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
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
Clement Jamin
7ca2c758da
Fix warnings in CGAL_ImageIO
2016-07-01 11:27:54 +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
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
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
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
Sébastien Loriot
d5cd488b8b
remove functions using the deprecated direct draw mode in ImageIO
2016-06-21 09:55:07 +02:00
Laurent Rineau
312aee625a
New overloads of CGAL::IMAGEIO::static_evaluate()
2016-06-15 18:10:14 +02:00
Guillaume Damiand
a15d3dd798
missing inline
2016-05-25 11:57:56 +02:00
Guillaume Damiand
0e4aa8525e
Second merge
2016-05-25 11:06:17 +02:00
Clement Jamin
186b525ba0
In Header-only mode, only 1 instance of firstFormat, InrimageFormat and rsff
...
See #626
2016-05-23 17:03:25 +02:00
Laurent Rineau
589a45e65e
Fix minor -Wconversion warnings in ImageIO
...
The old implementation seems harmless. I have added explicit casts to
quiet the warnings.
2016-04-22 12:36:11 +02:00
Laurent Rineau
810538d221
Fix 32bits issues in ImageIO
...
Those issues were detected by the compilation flag `-Wconversion` of
g++-5.3.
That changes the ABI of CGAL_ImageIO.
2016-04-22 12:35:32 +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
7bea6910ab
Perform the multiplication with size_t and not with int
2016-04-12 11:20:04 +02:00
Laurent Rineau
c6e4efb5f7
Fix when operating on huge files (>2GB)
2016-04-11 19:21:06 +02:00
Andreas Fabri
143fcd3b52
Only interpolate for existing labels
2016-03-03 10:35:33 +01:00
Jane Tournois
ee54380b73
fix conversion warnings
2016-02-12 14:30:31 +01:00
Andreas Fabri
13ff46e8d5
Add a static global singleton responsible for deallocation of memory to avoid vld warning
2016-01-18 14:24:37 +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
Laurent Rineau
9404a1e0ef
Fix compilation errors when WITH_VTK=ON in CMake
2016-01-11 16:28:13 +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
Maxime Gimeno
864c95ae08
Fix for #295
...
- Replacement of assert() by CGAL_assertion()
2015-10-29 10:39:53 +01:00