From c9c688949a4c332b2f483de0a489e027d2eac3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 23 Jul 2013 16:01:15 +0000 Subject: [PATCH] Fixed some size_t warnings git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@849 fdac6126-5c0c-442c-9429-916003d36597 --- src/Unittests/unittests_decimater.hh | 12 ++++++------ src/Unittests/unittests_delete_face.hh | 16 ++++++++-------- src/Unittests/unittests_mc_decimater.hh | 6 +++--- src/Unittests/unittests_mixed_decimater.hh | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Unittests/unittests_decimater.hh b/src/Unittests/unittests_decimater.hh index 7da994c2..87bce7fc 100644 --- a/src/Unittests/unittests_decimater.hh +++ b/src/Unittests/unittests_decimater.hh @@ -49,14 +49,14 @@ TEST_F(OpenMeshDecimater, DecimateMesh) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to(5000); decimaterDBG.mesh().garbage_collection(); - EXPECT_EQ(2526, removedVertices) << "The number of remove vertices is not correct!"; + EXPECT_EQ(2526, removedVertices) << "The number of remove vertices is not correct!"; EXPECT_EQ(5000u, mesh_.n_vertices()) << "The number of vertices after decimation is not correct!"; - EXPECT_EQ(14994u, mesh_.n_edges()) << "The number of edges after decimation is not correct!"; - EXPECT_EQ(9996u, mesh_.n_faces()) << "The number of faces after decimation is not correct!"; + EXPECT_EQ(14994u, mesh_.n_edges()) << "The number of edges after decimation is not correct!"; + EXPECT_EQ(9996u, mesh_.n_faces()) << "The number of faces after decimation is not correct!"; } TEST_F(OpenMeshDecimater, DecimateMeshToFaceVerticesLimit) { @@ -73,7 +73,7 @@ TEST_F(OpenMeshDecimater, DecimateMeshToFaceVerticesLimit) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to_faces(5000, 8000); decimaterDBG.mesh().garbage_collection(); @@ -97,7 +97,7 @@ TEST_F(OpenMeshDecimater, DecimateMeshToFaceFaceLimit) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to_faces(4500, 9996); decimaterDBG.mesh().garbage_collection(); diff --git a/src/Unittests/unittests_delete_face.hh b/src/Unittests/unittests_delete_face.hh index 8c21dd53..4bd92d9a 100644 --- a/src/Unittests/unittests_delete_face.hh +++ b/src/Unittests/unittests_delete_face.hh @@ -182,13 +182,13 @@ TEST_F(OpenMeshDeleteFaceTriangleMesh, DeleteHalfTriangleMeshCubeNoEdgeStatus) { mesh_.request_face_status(); mesh_.request_vertex_status(); mesh_.request_halfedge_status(); - const unsigned int n_face_to_delete = mesh_.n_faces()/2; + const size_t n_face_to_delete = mesh_.n_faces()/2; // Check the variable EXPECT_EQ(6u, n_face_to_delete ) << "Wrong number of faces to delete"; for(size_t i = 0; i < n_face_to_delete; i++) - mesh_.delete_face(mesh_.face_handle(i)); + mesh_.delete_face(mesh_.face_handle(int(i))); // ===================================================== // Check config afterwards @@ -343,13 +343,13 @@ TEST_F(OpenMeshDeleteFaceTriangleMesh, DeleteHalfTriangleMeshCubeWithEdgeStatus) mesh_.request_vertex_status(); mesh_.request_edge_status(); mesh_.request_halfedge_status(); - const unsigned int n_face_to_delete = mesh_.n_faces()/2; + const size_t n_face_to_delete = mesh_.n_faces()/2; // Check the variable EXPECT_EQ(6u, n_face_to_delete ) << "Wrong number of faces to delete"; for(size_t i = 0; i < n_face_to_delete; i++) - mesh_.delete_face(mesh_.face_handle(i)); + mesh_.delete_face(mesh_.face_handle(int(i))); // ===================================================== // Check config afterwards @@ -464,13 +464,13 @@ TEST_F(OpenMeshDeleteFacePolyMesh, DeleteteHalfPolyMeshCubeWithoutEdgeStatus) { mesh_.request_face_status(); mesh_.request_vertex_status(); mesh_.request_halfedge_status(); - const unsigned int n_face_to_delete = mesh_.n_faces()/2; + const size_t n_face_to_delete = mesh_.n_faces()/2; // Check the variable EXPECT_EQ(3u, n_face_to_delete ) << "Wrong number of faces to delete"; for(size_t i = 0; i < n_face_to_delete; i++) - mesh_.delete_face(mesh_.face_handle(i)); + mesh_.delete_face(mesh_.face_handle(int(i))); // ===================================================== // Check config afterwards @@ -584,13 +584,13 @@ TEST_F(OpenMeshDeleteFacePolyMesh, DeleteteHalfPolyMeshCubeWithEdgeStatus) { mesh_.request_vertex_status(); mesh_.request_edge_status(); mesh_.request_halfedge_status(); - const unsigned int n_face_to_delete = mesh_.n_faces()/2; + const size_t n_face_to_delete = mesh_.n_faces()/2; // Check the variable EXPECT_EQ(3u, n_face_to_delete ) << "Wrong number of faces to delete"; for(size_t i = 0; i < n_face_to_delete; i++) - mesh_.delete_face(mesh_.face_handle(i)); + mesh_.delete_face(mesh_.face_handle(int(i))); // ===================================================== // Check config afterwards diff --git a/src/Unittests/unittests_mc_decimater.hh b/src/Unittests/unittests_mc_decimater.hh index 3f7e7d06..59cc052e 100644 --- a/src/Unittests/unittests_mc_decimater.hh +++ b/src/Unittests/unittests_mc_decimater.hh @@ -49,7 +49,7 @@ TEST_F(OpenMeshMultipleChoiceDecimater, DecimateMesh) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to(5000); decimaterDBG.mesh().garbage_collection(); @@ -73,7 +73,7 @@ TEST_F(OpenMeshMultipleChoiceDecimater, DecimateMeshToFaceVerticesLimit) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to_faces(5000, 8000); decimaterDBG.mesh().garbage_collection(); @@ -97,7 +97,7 @@ TEST_F(OpenMeshMultipleChoiceDecimater, DecimateMeshToFaceFaceLimit) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to_faces(4500, 9996); decimaterDBG.mesh().garbage_collection(); diff --git a/src/Unittests/unittests_mixed_decimater.hh b/src/Unittests/unittests_mixed_decimater.hh index c3385b12..cc81ca15 100644 --- a/src/Unittests/unittests_mixed_decimater.hh +++ b/src/Unittests/unittests_mixed_decimater.hh @@ -49,7 +49,7 @@ TEST_F(OpenMeshMixedDecimater, DecimateMesh80PercentMc) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to(5000,0.8f); decimaterDBG.mesh().garbage_collection(); @@ -73,7 +73,7 @@ TEST_F(OpenMeshMixedDecimater, DecimateMeshToFaceVerticesLimit) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to_faces(5000, 8000, 0.7f); decimaterDBG.mesh().garbage_collection(); @@ -97,7 +97,7 @@ TEST_F(OpenMeshMixedDecimater, DecimateMeshToFaceFaceLimit) { HModQuadric hModQuadricDBG; decimaterDBG.add( hModQuadricDBG ); decimaterDBG.initialize(); - int removedVertices = 0; + size_t removedVertices = 0; removedVertices = decimaterDBG.decimate_to_faces(4500, 9996, 0.7f); decimaterDBG.mesh().garbage_collection();