From ee37edb46b15d839cb11a2322e14be31292e1846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 29 Aug 2013 07:17:03 +0000 Subject: [PATCH] =?UTF-8?q?-=20Fixed=20segfault=20of=20copy=5Fall=5Fproper?= =?UTF-8?q?ties=20if=20one=20property=20has=20been=20removed=20before.=20(?= =?UTF-8?q?Thanks=20to=20Simon=20Fl=C3=B6ry=20for=20the=20patch)=20-=20Add?= =?UTF-8?q?ed=20unittest=20for=20this=20case?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@951 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/Mesh/BaseKernel.hh | 8 +- src/Unittests/unittests_property.hh | 178 +++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 4 deletions(-) diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.hh b/src/OpenMesh/Core/Mesh/BaseKernel.hh index b7adb7de..e59e018b 100644 --- a/src/OpenMesh/Core/Mesh/BaseKernel.hh +++ b/src/OpenMesh/Core/Mesh/BaseKernel.hh @@ -472,7 +472,7 @@ public: // Copy all properties, if build in is true // Otherwise, copy only properties without build in specifier - if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "v:") + if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "v:" ) ) (*p_it)->copy(_vh_from.idx(), _vh_to.idx()); } @@ -491,7 +491,7 @@ public: // Copy all properties, if build in is true // Otherwise, copy only properties without build in specifier - if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "h:") + if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "h:") ) (*p_it)->copy(_hh_from.idx(), _hh_to.idx()); } @@ -509,7 +509,7 @@ public: // Copy all properties, if build in is true // Otherwise, copy only properties without build in specifier - if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "e:") + if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "e:") ) (*p_it)->copy(_eh_from.idx(), _eh_to.idx()); } @@ -529,7 +529,7 @@ public: // Copy all properties, if build in is true // Otherwise, copy only properties without build in specifier - if ( _copyBuildIn || (*p_it)->name().substr(0,2) != "f:") + if ( *p_it && ( _copyBuildIn || (*p_it)->name().substr(0,2) != "f:") ) (*p_it)->copy(_fh_from.idx(), _fh_to.idx()); } diff --git a/src/Unittests/unittests_property.hh b/src/Unittests/unittests_property.hh index c048497a..f6f5704d 100644 --- a/src/Unittests/unittests_property.hh +++ b/src/Unittests/unittests_property.hh @@ -418,5 +418,183 @@ TEST_F(OpenMeshProperties, CheckStatusPropertiesHalfedgeEdgeAllDeleted) { } +/* + * Copy properties from one mesh to another + * +*/ +TEST_F(OpenMeshProperties, CopyAllPropertiesVertexAfterRemoveOfProperty) { + + mesh_.clear(); + + // Add some vertices + Mesh::VertexHandle vhandle[4]; + + vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0)); + vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0)); + vhandle[2] = mesh_.add_vertex(Mesh::Point(1, 1, 0)); + vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0)); + + // Add two faces + std::vector face_vhandles; + + face_vhandles.push_back(vhandle[2]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[0]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[2]); + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[3]); + mesh_.add_face(face_vhandles); + + // Test setup: + // 1 === 2 + // | / | + // | / | + // | / | + // 0 === 3 + + // Check setup + EXPECT_EQ(4u, mesh_.n_vertices() ) << "Wrong number of vertices"; + EXPECT_EQ(2u, mesh_.n_faces() ) << "Wrong number of faces"; + + // Add a double vertex property + OpenMesh::VPropHandleT doubleHandle; + + EXPECT_FALSE( mesh_.get_property_handle(doubleHandle,"doubleProp") ); + + mesh_.add_property(doubleHandle,"doubleProp"); + + EXPECT_TRUE(mesh_.get_property_handle(doubleHandle,"doubleProp")); + + // Add a double vertex property + OpenMesh::VPropHandleT intHandle; + + EXPECT_FALSE( mesh_.get_property_handle(intHandle,"intProp") ); + + mesh_.add_property(intHandle,"intProp"); + + EXPECT_TRUE(mesh_.get_property_handle(intHandle,"intProp")); + + // Now remove the double property again. + mesh_.remove_property(doubleHandle); + + // Fill int property + for ( Mesh::VertexIter v_it = mesh_.vertices_begin() ; v_it != mesh_.vertices_end(); ++v_it ) { + mesh_.property(intHandle,*v_it) = v_it->idx(); + } + + // Check if property it is ok. + Mesh::VertexIter v_it = mesh_.vertices_begin(); + EXPECT_EQ( 0, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 0"; + ++v_it; + + EXPECT_EQ( 1, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 1"; + ++v_it; + + EXPECT_EQ( 2, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 2"; + ++v_it; + + EXPECT_EQ( 3, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 3"; + + // Check vertex positions + v_it = mesh_.vertices_begin(); + + EXPECT_EQ( 0, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 0"; + EXPECT_EQ( 0, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 0"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 0"; + ++v_it; + + EXPECT_EQ( 0, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 1"; + EXPECT_EQ( 1, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 1"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 1"; + ++v_it; + + EXPECT_EQ( 1, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 2"; + EXPECT_EQ( 1, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 2"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 2"; + ++v_it; + + EXPECT_EQ( 1, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 3"; + EXPECT_EQ( 0, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 3"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 3"; + ++v_it; + + //=========================================================== + // Copy from vertex 1 to 0, with skipping build in properties + //=========================================================== + mesh_.copy_all_properties(vhandle[1], vhandle[0]); + + // Check vertex positions + v_it = mesh_.vertices_begin(); + + EXPECT_EQ( 0, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 0 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 0 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 0 after copy"; + ++v_it; + + EXPECT_EQ( 0, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 1 after copy"; + EXPECT_EQ( 1, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 1 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 1 after copy"; + ++v_it; + + EXPECT_EQ( 1, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 2 after copy"; + EXPECT_EQ( 1, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 2 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 2 after copy"; + ++v_it; + + EXPECT_EQ( 1, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 3 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 3 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 3 after copy"; + ++v_it; + + v_it = mesh_.vertices_begin(); + EXPECT_EQ( 1, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 0 after copy"; ++v_it; + EXPECT_EQ( 1, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 1 after copy"; ++v_it; + EXPECT_EQ( 2, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 2 after copy"; ++v_it; + EXPECT_EQ( 3, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 3 after copy"; + + //=========================================================== + // Copy from vertex 2 to 3, including build in properties + //=========================================================== + mesh_.copy_all_properties(vhandle[2], vhandle[3], true); + + // Check vertex positions + v_it = mesh_.vertices_begin(); + + EXPECT_EQ( 0, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 0 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 0 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 0 after copy"; + ++v_it; + + EXPECT_EQ( 0, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 1 after copy"; + EXPECT_EQ( 1, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 1 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 1 after copy"; + ++v_it; + + EXPECT_EQ( 1, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 2 after copy"; + EXPECT_EQ( 1, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 2 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 2 after copy"; + ++v_it; + + EXPECT_EQ( 1, mesh_.point(*v_it)[0] ) << "Invalid x position for vertex 3 after copy"; + EXPECT_EQ( 1, mesh_.point(*v_it)[1] ) << "Invalid y position for vertex 3 after copy"; + EXPECT_EQ( 0, mesh_.point(*v_it)[2] ) << "Invalid z position for vertex 3 after copy"; + ++v_it; + + v_it = mesh_.vertices_begin(); + EXPECT_EQ( 1, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 0 after copy"; ++v_it; + EXPECT_EQ( 1, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 1 after copy"; ++v_it; + EXPECT_EQ( 2, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 2 after copy"; ++v_it; + EXPECT_EQ( 2, mesh_.property(intHandle,*v_it) ) << "Invalid int value for vertex 3 after copy"; + + + +} + + + #endif // INCLUDE GUARD