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

Fixed size_t conversion warnings in OBJReader

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@843 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-07-23 13:32:21 +00:00
parent e8e626037f
commit 6e62de90d4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenMesh/Core/IO/reader/OBJReader.cc
View File

@@ -504,7 +504,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// Calculation of index : // Calculation of index :
// -1 is the last vertex in the list // -1 is the last vertex in the list
// As obj counts from 1 and not zero add +1 // As obj counts from 1 and not zero add +1
value = _bi.n_vertices() + value + 1; value = int(_bi.n_vertices() + value + 1);
} }
// Obj counts from 1 and not zero .. array counts from zero therefore -1 // Obj counts from 1 and not zero .. array counts from zero therefore -1
vhandles.push_back(VertexHandle(value-1)); vhandles.push_back(VertexHandle(value-1));
@@ -518,7 +518,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// Calculation of index : // Calculation of index :
// -1 is the last vertex in the list // -1 is the last vertex in the list
// As obj counts from 1 and not zero add +1 // As obj counts from 1 and not zero add +1
value = texcoords.size() + value + 1; value = int(texcoords.size()) + value + 1;
} }
assert(!vhandles.empty()); assert(!vhandles.empty());
@@ -551,7 +551,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// Calculation of index : // Calculation of index :
// -1 is the last vertex in the list // -1 is the last vertex in the list
// As obj counts from 1 and not zero add +1 // As obj counts from 1 and not zero add +1
value = normals.size() + value + 1; value = int(normals.size()) + value + 1;
} }
// Obj counts from 1 and not zero .. array counts from zero therefore -1 // Obj counts from 1 and not zero .. array counts from zero therefore -1
@@ -587,7 +587,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
std::vector<FaceHandle> newfaces; std::vector<FaceHandle> newfaces;
for( size_t i=0; i < _bi.n_faces()-n_faces; ++i ) for( size_t i=0; i < _bi.n_faces()-n_faces; ++i )
newfaces.push_back(FaceHandle(n_faces+i)); newfaces.push_back(FaceHandle(int(n_faces+i)));
Material& mat = materials_[matname]; Material& mat = materials_[matname];
@@ -630,7 +630,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
std::vector<FaceHandle> newfaces; std::vector<FaceHandle> newfaces;
for( size_t i=0; i < _bi.n_faces()-n_faces; ++i ) for( size_t i=0; i < _bi.n_faces()-n_faces; ++i )
newfaces.push_back(FaceHandle(n_faces+i)); newfaces.push_back(FaceHandle(int(n_faces+i)));
// Set the texture index to zero as we don't have any information // Set the texture index to zero as we don't have any information
if ( userOptions.face_has_texcoord() ) if ( userOptions.face_has_texcoord() )