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

Fixed some size_t warnings

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@849 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-07-23 16:01:15 +00:00
parent 6428c6b9f4
commit c9c688949a
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Unittests/unittests_decimater.hh
View File

@@ -49,14 +49,14 @@ TEST_F(OpenMeshDecimater, DecimateMesh) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to(5000); removedVertices = decimaterDBG.decimate_to(5000);
decimaterDBG.mesh().garbage_collection(); 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(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(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(9996u, mesh_.n_faces()) << "The number of faces after decimation is not correct!";
} }
TEST_F(OpenMeshDecimater, DecimateMeshToFaceVerticesLimit) { TEST_F(OpenMeshDecimater, DecimateMeshToFaceVerticesLimit) {
@@ -73,7 +73,7 @@ TEST_F(OpenMeshDecimater, DecimateMeshToFaceVerticesLimit) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to_faces(5000, 8000); removedVertices = decimaterDBG.decimate_to_faces(5000, 8000);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();
@@ -97,7 +97,7 @@ TEST_F(OpenMeshDecimater, DecimateMeshToFaceFaceLimit) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to_faces(4500, 9996); removedVertices = decimaterDBG.decimate_to_faces(4500, 9996);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();

16
src/Unittests/unittests_delete_face.hh
View File

@@ -182,13 +182,13 @@ TEST_F(OpenMeshDeleteFaceTriangleMesh, DeleteHalfTriangleMeshCubeNoEdgeStatus) {
mesh_.request_face_status(); mesh_.request_face_status();
mesh_.request_vertex_status(); mesh_.request_vertex_status();
mesh_.request_halfedge_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 // Check the variable
EXPECT_EQ(6u, n_face_to_delete ) << "Wrong number of faces to delete"; EXPECT_EQ(6u, n_face_to_delete ) << "Wrong number of faces to delete";
for(size_t i = 0; i < n_face_to_delete; i++) 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 // Check config afterwards
@@ -343,13 +343,13 @@ TEST_F(OpenMeshDeleteFaceTriangleMesh, DeleteHalfTriangleMeshCubeWithEdgeStatus)
mesh_.request_vertex_status(); mesh_.request_vertex_status();
mesh_.request_edge_status(); mesh_.request_edge_status();
mesh_.request_halfedge_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 // Check the variable
EXPECT_EQ(6u, n_face_to_delete ) << "Wrong number of faces to delete"; EXPECT_EQ(6u, n_face_to_delete ) << "Wrong number of faces to delete";
for(size_t i = 0; i < n_face_to_delete; i++) 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 // Check config afterwards
@@ -464,13 +464,13 @@ TEST_F(OpenMeshDeleteFacePolyMesh, DeleteteHalfPolyMeshCubeWithoutEdgeStatus) {
mesh_.request_face_status(); mesh_.request_face_status();
mesh_.request_vertex_status(); mesh_.request_vertex_status();
mesh_.request_halfedge_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 // Check the variable
EXPECT_EQ(3u, n_face_to_delete ) << "Wrong number of faces to delete"; EXPECT_EQ(3u, n_face_to_delete ) << "Wrong number of faces to delete";
for(size_t i = 0; i < n_face_to_delete; i++) 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 // Check config afterwards
@@ -584,13 +584,13 @@ TEST_F(OpenMeshDeleteFacePolyMesh, DeleteteHalfPolyMeshCubeWithEdgeStatus) {
mesh_.request_vertex_status(); mesh_.request_vertex_status();
mesh_.request_edge_status(); mesh_.request_edge_status();
mesh_.request_halfedge_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 // Check the variable
EXPECT_EQ(3u, n_face_to_delete ) << "Wrong number of faces to delete"; EXPECT_EQ(3u, n_face_to_delete ) << "Wrong number of faces to delete";
for(size_t i = 0; i < n_face_to_delete; i++) 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 // Check config afterwards

6
src/Unittests/unittests_mc_decimater.hh
View File

@@ -49,7 +49,7 @@ TEST_F(OpenMeshMultipleChoiceDecimater, DecimateMesh) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to(5000); removedVertices = decimaterDBG.decimate_to(5000);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();
@@ -73,7 +73,7 @@ TEST_F(OpenMeshMultipleChoiceDecimater, DecimateMeshToFaceVerticesLimit) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to_faces(5000, 8000); removedVertices = decimaterDBG.decimate_to_faces(5000, 8000);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();
@@ -97,7 +97,7 @@ TEST_F(OpenMeshMultipleChoiceDecimater, DecimateMeshToFaceFaceLimit) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to_faces(4500, 9996); removedVertices = decimaterDBG.decimate_to_faces(4500, 9996);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();

6
src/Unittests/unittests_mixed_decimater.hh
View File

@@ -49,7 +49,7 @@ TEST_F(OpenMeshMixedDecimater, DecimateMesh80PercentMc) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to(5000,0.8f); removedVertices = decimaterDBG.decimate_to(5000,0.8f);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();
@@ -73,7 +73,7 @@ TEST_F(OpenMeshMixedDecimater, DecimateMeshToFaceVerticesLimit) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to_faces(5000, 8000, 0.7f); removedVertices = decimaterDBG.decimate_to_faces(5000, 8000, 0.7f);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();
@@ -97,7 +97,7 @@ TEST_F(OpenMeshMixedDecimater, DecimateMeshToFaceFaceLimit) {
HModQuadric hModQuadricDBG; HModQuadric hModQuadricDBG;
decimaterDBG.add( hModQuadricDBG ); decimaterDBG.add( hModQuadricDBG );
decimaterDBG.initialize(); decimaterDBG.initialize();
int removedVertices = 0; size_t removedVertices = 0;
removedVertices = decimaterDBG.decimate_to_faces(4500, 9996, 0.7f); removedVertices = decimaterDBG.decimate_to_faces(4500, 9996, 0.7f);
decimaterDBG.mesh().garbage_collection(); decimaterDBG.mesh().garbage_collection();