Commit Graph

3647 Commits

Author SHA1 Message Date
Sébastien Loriot 9543deb304 Merge pull request #6046 from MaelRL/PM-Fix_pmaps_reference_types_master-GF
Various fixes for property maps (master)
2021-10-29 17:40:15 +02:00
Sébastien Loriot 3cf45cb83b update image path 2021-10-29 17:24:44 +02: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
Laurent Rineau 7b9113ac0c Merge pull request #6034 from sloriot/CGAL_data-moving_files
CGAL Data: doc + more data moves
2021-10-29 17:00:07 +02:00
Laurent Rineau bb7253638e Merge pull request #6040 from lrineau/Mesh_3-remove_const_in_Set_of_indices-lrineau
CGAL/Mesh_3/experimental/AABB_filtered_projection_traits.h: Remove  boost::remove_const<..> from the index type
2021-10-29 16:59:59 +02:00
Laurent Rineau aca24f489b Merge pull request #6054 from janetournois/Mesh_3-uninitialized_warnings-GF
Mesh_3 - fix maybe uninitialized warning
2021-10-29 16:59:45 +02:00
Jane Tournois 70ad367964 add CMake warning when ITK is not found 2021-10-29 12:27:04 +02:00
Jane Tournois 0498cace68 add and use CGAL_ITK_support.cmake 2021-10-29 12:27:04 +02:00
Jane Tournois b664ee54c3 workaround deprecation warning of versions < 5 of ITK 2021-10-29 12:27:04 +02:00
Jane Tournois a9318b3832 fix maybe uninitialized warning 2021-10-15 09:48:54 +02:00
Sébastien Loriot fab7c364fd function is in the IO namespace 2021-10-13 17:49:50 +02:00
Mael Rouxel-Labbé 8166579e55 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF 2021-10-11 19:58:07 +02:00
Jane Tournois c8918a9b0d fix conversion warning 2021-10-11 13:19:40 +02:00
Laurent Rineau 1af4f9336b Remove boost::remove_const<..> for the index type
It does not seem to be necessary. Actually, I really do not see why it
could have been necessary in the past.
2021-10-08 16:24:51 +02:00
Mael Rouxel-Labbé 590ddf8015 Various fixes for pmaps:
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
  a reference (to avoid `typename PM::reference r = get(m, k)`,
  which will take a ref to a temporary if the `reference`
  typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
  **mutable** property map: the `put()` is `map[k] = v`, which
  is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
  not a reference in `get(map, key)`. You can have a readable property map
  returning a reference through its `get(map, key)`, but if there is
  no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
  or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
  of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
  * `value_type& operator[](key&)`
  * `ref get(map, const key&)`
  * `put(map, const key&, const value_type&)`
  and non-mutable lvalue pmap:
  * `const value_type& operator[](const key&)`
  * `ref get(map, const key&)`
  but not everything fits properly...
2021-10-08 15:38:47 +02:00
Mael Rouxel-Labbé df560987a6 Whitespace & cleaning changes 2021-10-08 12:13:43 +02:00
Sébastien Loriot 44df66485d move images 2021-10-07 14:47:15 +02:00
Sébastien Loriot 1857a25d28 Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files 2021-10-06 13:50:31 +02:00
Laurent Rineau a5e3469e78 Merge pull request #6011 from janetournois/Mesh_3-prevent_bad_initialization-jtournois
Mesh_3 - warning message after bad initialization
2021-10-06 12:04:54 +02:00
Jane Tournois ac7b637247 make types consistent with non-weighted label images 2021-10-05 10:27:03 +02:00
Jane Tournois f5eeffbbf6 remove unnecessary inheritance 2021-10-04 16:41:40 +02:00
Jane Tournois 5b2e4d1501 replace std::unary_function, that is deprecated in C++11 2021-10-04 16:09:50 +02:00
Jane Tournois 509ecfa7d2 smoothing/smoother 2021-10-04 15:44:17 +02:00
Jane Tournois a6d486f11a add missing cast 2021-10-04 15:23:44 +02:00
Jane Tournois 8a6d92fff8 use "image of weights" in doc 2021-10-04 12:12:02 +02:00
Jane Tournois dd493fdc9a loop on i because label is not used 2021-10-04 12:11:45 +02:00
Sébastien Loriot 8350dea94a char* -> std::string 2021-10-04 09:49:24 +02:00
Sébastien Loriot e805052e9e manual fixes 2021-10-04 09:43:55 +02:00
Sébastien Loriot 47028cd184 automatically move data files in data dir + update paths
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +02:00
Jane Tournois cf4edabb9e user manual 2021-10-04 09:12:56 +02:00
Jane Tournois 932639eb6f move warning code to have it happen when c3t3 has already been scanned 2021-09-30 11:24:21 +02:00
Jane Tournois dc0dad1577 remove wrong recommendation 2021-09-27 11:02:42 +02:00
Jane Tournois b58c67d712 use macros 2021-09-24 14:41:10 +02:00
Jane Tournois 6d42c1ddf2 add warning message for the case when initialization has failed 2021-09-24 11:14:29 +02:00
Sébastien Loriot 71932f2f1e manual fixes 2021-09-23 18:56:29 +02:00
Sébastien Loriot 7de9564e1c remove archive directories that are of not use (available in git history) 2021-09-23 18:55:54 +02:00
Sébastien Loriot e58836baf0 move off files from archive to meshes 2021-09-23 18:54:58 +02:00
Sébastien Loriot bd345c7f83 remove .cmd files for examples 2021-09-23 18:54:46 +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 9c02c24cd2 add missing cmake module requirement 2021-09-23 11:29:02 +02:00
Jane Tournois 95a4613435 Merge branch 'Mesh_3-weighted_images-GF' of github.com:lrineau/cgal into Mesh_3-weighted_images-GF 2021-09-23 10:23:31 +01:00
Jane Tournois 8a882ad33a Cmake : use only the required modules of ITK 2021-09-23 11:22:59 +02:00
Jane Tournois bddb4fcdc6 remove debug code
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-09-23 10:54:31 +02:00
Jane Tournois 17215709a7 create CGAL::Image_3 for weights before counting non-white pixels
and avoid implicit conversion to CGAL::Image_3 in the call
to count_non_white_pixels, which was then calling the destructor of
CGAL::Image_3, deleting `weights` at the same time
2021-09-23 10:46:28 +02:00
Jane Tournois 0bc25f9f20 doc (add dependency and new link) 2021-09-21 21:44:40 +02:00
Jane Tournois 8bfb4e4464 avoid all triple for loops on i,j,k 2021-09-21 19:45:51 +02:00
Jane Tournois e516b194b9 use Parallel_if_available_tag 2021-09-20 12:00:25 +02:00
Jane Tournois 666a54097d documents weights size 2021-09-20 12:00:11 +02:00
Sébastien Loriot 5945e48a3e restore sub-directories accidently removed in 98e471849b 2021-09-17 08:14:06 +02:00
Sébastien Loriot a93dda81cd Merge pull request #5935 from janetournois/CGAL-fix_warnings_c++20-jtournois
Fix warnings for C++20
2021-09-10 17:43:47 +02:00