songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
110,887 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

147 Commits

Author SHA1 Message Date
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
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 5d1704b9d1 Fix typo 2019-10-24 09:29:16 +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 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
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
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 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
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
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 cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Laurent Rineau 6b24740299 Update the VTK support to VTK 6.x 2015-07-09 14:44:02 +02:00
Guillaume Damiand 1712a1b889 Modify #include for CGAL_ImageIO after the moves of header files 2015-03-26 21:16:09 +01:00
Guillaume Damiand 808c7c02fa Move .h files of CGAL_ImageIO in src/CGAL_ImageIO/ (their original position) 2015-03-26 19:59:18 +01:00
Guillaume Damiand 0e31ccf5e5 Remove commented lines 2015-03-17 08:58:25 +01:00
Guillaume Damiand 7457fc2fc7 Replace #include name 2015-03-16 21:17:42 +01:00
Guillaume Damiand cca136c131 Wip 2015-03-16 18:06:53 +01:00
Guillaume Damiand e887fc1606 Ok for cgal_imageio 2015-03-16 16:22:01 +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 6529a13915 wdim should also be a std::size_t 2014-10-24 13:51:23 +02:00
Jane Tournois b4a8992e2a complete the use of std::size_t instead of unsigned int in Image_IO 2014-10-20 13:06:33 +02: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
Eric Berberich 0608eba0f1 correct library names 2012-08-03 18:09:57 +00:00
Eric Berberich 326179f482 packagename reflects library name (CGAL_ImageIO is shipped with CGAL) 2012-08-03 17:31:39 +00:00