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

211 Commits

Author SHA1 Message Date
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
Clement Jamin 4e121c471e Fix `status` type and usage 2016-06-15 11:39:24 +02:00
Clement Jamin a95ae40c65 Fix warnings 2016-06-10 14:08:16 +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
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +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
Laurent Rineau 12be44eac3 Merge pull request #997 from lrineau/CGAL_ImageIO-fix_with_huge_files-GF 
(Merged from remote-tracking branch 'cgal/releases/CGAL-4.8-branch')
 2016-04-14 15:44:05 +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
Laurent Rineau ff515d72bb Fix issue #954 (resource leak) 2016-03-29 13:34:44 +02:00
Laurent Rineau fd42bc1d15 Step 2 
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
 2016-03-09 17:14:04 +01:00
Clement Jamin dd3ed5b07c Remove the "S" from HEADERS_ONLY 2016-03-09 10:58:55 +01:00
Clement Jamin 35a11c0e13 Use CGAL_HEADERS_ONLY everywhere 2016-03-09 10:56:11 +01:00
Guillaume Damiand 7c670764a8 iris_impl.h is not in CGAL dir 2016-03-09 10:33:53 +01:00
Guillaume Damiand 83d5151077 Add src/CGAL_ImageIO/ in include dirs in header mode 2016-03-09 10:33:53 +01:00
Guillaume Damiand c58ab58860 Do not empty cgal configured libraries variable in header only mode. 2016-03-09 10:31:17 +01:00
Guillaume Damiand 6d55c3b140 Do the target_link_libraries in all CGAL_XXX libraries only in non header only mode. 2016-03-09 10:22:43 +01: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
Sébastien Loriot 2ed0fc0fdf Merge pull request #151 from cjamin/gsoc2014-2d-reconstruction-ivovigan 
2D Reconstruction Simplification, new package, GSoC 2014
 2016-02-09 19:42:32 +01:00
Simon Giraudot 35c2f29ded Add missing includes to CGAL_ImageIO files 2016-02-04 15:30:16 +01:00
Simon Giraudot 006f3ee6ba Remove useless string header 2016-02-04 13:06:05 +01:00
Sébastien Loriot 9fceea22cc add missing include directive 2016-02-04 12:43:30 +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
Sebastien Loriot 78dc72841e Merge pull request #562 from sgiraudot/CGAL-Remove_register_keyword-GF 
Remove deprecated "register" keyword
 2015-12-18 16:52:14 +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
Simon Giraudot f21cb46900 Remove deprecated "register" keyword 2015-12-17 08:20:56 +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
Clement Jamin d35c807619 Missing includes 2015-11-25 16:40:39 +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 e4342d50d2 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only-gdamiand_cjamin' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:48:54 +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