songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation errors and warnings

This commit is contained in:
Sébastien Loriot 2024-03-27 10:36:55 +01:00
parent 8f973c3cb1
commit 7205e10f89
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tetrahedral_remeshing/examples/Tetrahedral_remeshing/tetrahedral_remeshing_generate_input.h
View File

@ -169,7 +169,7 @@ namespace Tetrahedral_remeshing
std::size_t i = 0; std::size_t i = 0;
for (const Point& p : pc) for (const Point& p : pc)
{ {
vpc[i] = tr.insert(pc[i]); vpc[i] = tr.insert(p);
vpc[i]->set_dimension(0); vpc[i]->set_dimension(0);
++i; ++i;
} }
@ -197,9 +197,9 @@ namespace Tetrahedral_remeshing
c->set_subdomain_index(1); c->set_subdomain_index(1);
// set surface patches // set surface patches
for (auto f : tr.finite_facets()) for (typename Tr::Facet f : tr.finite_facets())
{ {
auto& mf = tr.mirror_facet(f); typename Tr::Facet mf = tr.mirror_facet(f);
if(tr.is_infinite(f.first) || tr.is_infinite(mf.first)) if(tr.is_infinite(f.first) || tr.is_infinite(mf.first))
{ {
f.first->set_surface_patch_index(f.second, 2); f.first->set_surface_patch_index(f.second, 2);

2
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Adaptive_remeshing_sizing_field.h
View File

@ -126,7 +126,7 @@ public:
* Returns size at point `p` * Returns size at point `p`
*/ */
template <typename Index> template <typename Index>
FT operator()(const Bare_point& p, const int& dim, const Index& i) const FT operator()(const Bare_point& p, const int& dim, const Index& /* i */) const
{ {
const int nb_neighbors = (dim == 3) ? 20 : 6; const int nb_neighbors = (dim == 3) ? 20 : 6;

3
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h
View File

@ -24,6 +24,7 @@
#include <CGAL/AABB_tree.h> #include <CGAL/AABB_tree.h>
#include <CGAL/AABB_triangle_primitive.h> #include <CGAL/AABB_triangle_primitive.h>
#include <CGAL/AABB_segment_primitive.h> #include <CGAL/AABB_segment_primitive.h>
#include <CGAL/use.h>
#include <optional> #include <optional>
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
@ -717,6 +718,7 @@ private:
const Point_3 smoothed_position = current_pos + move; const Point_3 smoothed_position = current_pos + move;
CGAL_USE(vertices_normals);
#ifdef CGAL_TET_REMESHING_SMOOTHING_WITH_MLS #ifdef CGAL_TET_REMESHING_SMOOTHING_WITH_MLS
Vector_3 sum_projections = CGAL::NULL_VECTOR; Vector_3 sum_projections = CGAL::NULL_VECTOR;
@ -741,6 +743,7 @@ private:
const Point_3 new_pos = m_segments_aabb_tree.closest_point(smoothed_position); const Point_3 new_pos = m_segments_aabb_tree.closest_point(smoothed_position);
#endif //CGAL_TET_REMESHING_SMOOTHING_WITH_MLS #endif //CGAL_TET_REMESHING_SMOOTHING_WITH_MLS
#ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG #ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG

2
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h
View File

@ -511,7 +511,7 @@ private:
{ {
for (typename Tr::Facet f : tr().finite_facets()) for (typename Tr::Facet f : tr().finite_facets())
{ {
typename Tr::Facet mf = tr().mirror_facet(f); CGAL_assertion_code(typename Tr::Facet mf = tr().mirror_facet(f));
CGAL_assertion(m_c3t3.is_in_complex(f) == m_c3t3.is_in_complex(mf)); CGAL_assertion(m_c3t3.is_in_complex(f) == m_c3t3.is_in_complex(mf));
} }
} }