manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed name of template param of LoadFaceOcf (it was the same as the tesmplate name of the class)

This commit is contained in:
ganovelli 2009-10-30 23:43:09 +00:00
parent 513be1d83b
commit 1ea77adee6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wrap/io_trimesh/import_vmi.h
View File

@ -297,7 +297,7 @@ namespace io {
return mask; return mask;
} }
template <typename OpenMeshType, typename CONT> template <typename MeshType, typename CONT>
struct LoadVertexOcf{ struct LoadVertexOcf{
LoadVertexOcf(FILE*f,const CONT & vert){ LoadVertexOcf(FILE*f,const CONT & vert){
// do nothing, it is a std::vector // do nothing, it is a std::vector
@ -306,9 +306,9 @@ namespace io {
template <typename OpenMeshType> template <typename MeshType>
struct struct
LoadVertexOcf<OpenMeshType,vertex::vector_ocf<typename OpenMeshType::VertexType> >{ LoadVertexOcf<MeshType,vertex::vector_ocf<typename OpenMeshType::VertexType> >{
typedef typename OpenMeshType::VertexType VertexType; typedef typename OpenMeshType::VertexType VertexType;
LoadVertexOcf( FILE * f, vertex::vector_ocf<typename OpenMeshType::VertexType> & vert){ LoadVertexOcf( FILE * f, vertex::vector_ocf<typename OpenMeshType::VertexType> & vert){
std::string s; std::string s;
@ -379,7 +379,7 @@ namespace io {
} }
}; };
template <typename OpenMeshType, typename CONT> template <typename MeshType, typename CONT>
struct LoadFaceOcf{ struct LoadFaceOcf{
LoadFaceOcf(FILE * f, const CONT & face){ LoadFaceOcf(FILE * f, const CONT & face){
// do nothing, it is a std::vector // do nothing, it is a std::vector
@ -432,8 +432,8 @@ namespace io {
/* partial specialization for vector_ocf */ /* partial specialization for vector_ocf */
template <typename OpenMeshType> template <typename MeshType>
struct LoadFaceOcf< OpenMeshType, face::vector_ocf<typename OpenMeshType::FaceType> >{ struct LoadFaceOcf< MeshType, face::vector_ocf<typename OpenMeshType::FaceType> >{
typedef typename OpenMeshType::FaceType FaceType; typedef typename OpenMeshType::FaceType FaceType;
LoadFaceOcf( FILE * f, face::vector_ocf<FaceType> & face){ LoadFaceOcf( FILE * f, face::vector_ocf<FaceType> & face){
std::string s; std::string s;
@ -610,8 +610,8 @@ namespace io {
static bool LoadMask(FILE * f, int & mask){ static bool LoadMask(FILE * f, int & mask){
std::vector<std::string> nameV; std::vector<std::string> nameV;
std::vector<std::string> nameF; std::vector<std::string> nameF;
int vertSize, faceSize, mask; int vertSize, faceSize;
GetHeader(f,nameV,namef,vertSize, faceSize, mask); GetHeader(f,nameV,nameF,vertSize, faceSize, mask);
return true; return true;
} }