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

2364 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
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 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 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
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
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 a6d486f11a add missing cast 2021-10-04 15:23:44 +02:00
Jane Tournois dd493fdc9a loop on i because label is not used 2021-10-04 12:11:45 +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
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 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 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
Mael Rouxel-Labbé 8a92d51601 Merge branch 'Distance_3-Add_Tri_Tri-GF-old' into Distance_3-Add_Tri_Tri-GF 2021-09-02 17:26:44 +02:00
Jane Tournois e1d4c0df80 rename generate_weights() to generate_label_weights() 2021-08-31 14:58:21 +02:00
Sébastien Loriot 2c889a3b52 remove unused files 2021-08-26 11:43:58 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Sébastien Loriot 1a65f4ca0a Merge remote-tracking branch 'cgal/5.3.x-branch' 2021-08-25 19:33:46 +02:00
Sébastien Loriot 3d77cbd804 Merge remote-tracking branch 'cgal/5.2.x-branch' into HEAD 2021-08-25 19:33:29 +02:00
Jane Tournois 5439dbd07e fix mismatch between two definitions of Mesher_level_conflict_status 
that were in different namespaces (CGAL and CGAL::Mesh_3)
 2021-08-25 19:32:13 +02:00
Jane Tournois 4b84c4b1f3 move dump to debug code 2021-07-29 12:02:40 +02:00
Jane Tournois 438422eb6d fix outdated code 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2021-07-29 11:29:32 +02:00
Jane Tournois d1de29d7f1 improve debug code 2021-07-29 10:46:00 +02:00
Jane Tournois b2d762256f add missing id increment 2021-07-29 10:43:43 +02:00
Jane Tournois 720d1a7ca8 fix types and do not skip label 0 2021-07-28 17:35:25 +02:00
Jane Tournois 2637bf6343 add weighted images to the demo 2021-07-27 09:33:49 +02:00
Jane Tournois c5a6838a03 add missing typename 2021-07-26 15:14:18 +02:00
Jane Tournois fc9aed70e9 doc 2021-07-26 14:27:55 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Laurent Rineau 5896af7960 Fix indentation 2021-07-13 11:49:51 +02:00
Laurent Rineau f8a2878b0c Port Mesh_3 to oneAPI-TBB 
The work was already mostly done in PR #4892, but there was still two
issues:
  - `tbb::parallel_do` has been removed, and `tbb::parall_for_each`
  was to be used instead,
  - the support for `tbb_hasher` has been removed.

This time, I have tested in a container were
intel-oneapi-tbb-common-devel-2021.3.0-2021.3.0-511.noarch was
installed, but not tbb version 2020.
 2021-07-13 11:38:43 +02:00
Jane Tournois ba95896f93 add doc for weighted images 2021-07-06 15:56:55 +02:00
Jane Tournois d069c07b04 remove Image_word_type template parameter 2021-07-05 14:38:46 +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 ee6f2f8df5 wrap debug code in macro CGAL_MESH_3_WEIGHTED_IMAGES_DEBUG 2021-06-24 15:04:09 +02:00
Jane Tournois 5828996f2e the Weights_type is unsigned char, not Image_word_type 2021-06-24 14:50:10 +02:00