Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'marinom/fix-MSCV-warning' into 'master'

Browse Source 
Fix a MSVC warning in TriConnectivity

See merge request OpenMesh/OpenMesh!262
This commit is contained in:
Jan Möbius
2020-05-07 07:06:19 +02:00
parent 44429ec872 9ddd4662ea
commit 8e705013cb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenMesh/Core/Mesh/TriConnectivity.cc
View File

@@ -494,7 +494,7 @@ void TriConnectivity::split_copy(EdgeHandle _eh, VertexHandle _vh)
const VertexHandle v0 = to_vertex_handle(halfedge_handle(_eh, 0)); const VertexHandle v0 = to_vertex_handle(halfedge_handle(_eh, 0));
const VertexHandle v1 = to_vertex_handle(halfedge_handle(_eh, 1)); const VertexHandle v1 = to_vertex_handle(halfedge_handle(_eh, 1));
const int nf = n_faces(); const size_t nf = n_faces();
// Split the halfedge ( handle will be preserved) // Split the halfedge ( handle will be preserved)
split(_eh, _vh); split(_eh, _vh);
@@ -512,7 +512,7 @@ void TriConnectivity::split_copy(EdgeHandle _eh, VertexHandle _vh)
{ {
FaceHandle fh0 = face_handle(h); FaceHandle fh0 = face_handle(h);
FaceHandle fh1 = face_handle(opposite_halfedge_handle(prev_halfedge_handle(h))); FaceHandle fh1 = face_handle(opposite_halfedge_handle(prev_halfedge_handle(h)));
if (fh0.idx() >= nf) // is fh0 the new face? if (static_cast<size_t>(fh0.idx()) >= nf) // is fh0 the new face?
std::swap(fh0, fh1); std::swap(fh0, fh1);
// copy properties from old face to new face // copy properties from old face to new face