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

Resolved scoping of constant of OFF codes

This commit is contained in:
Paolo Cignoni 2005-01-26 22:44:51 +00:00
parent aed29264bb
commit 54d5f9c148
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wrap/io_trimesh/import_off.h
View File

@ -24,6 +24,10 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.5 2005/01/18 12:35:18 rita_borgo
Added #include<vcg/complex/trimesh/allocate.h>
it was giving problems with Allocator::
Revision 1.4 2005/01/03 11:18:24 cignoni Revision 1.4 2005/01/03 11:18:24 cignoni
changed a .. rfind('OFF') .. in rfind("OFF") and added some casts changed a .. rfind('OFF') .. in rfind("OFF") and added some casts
@ -103,7 +107,7 @@ namespace vcg
std::ifstream stream(filename); std::ifstream stream(filename);
if (stream.fail()) if (stream.fail())
return OFFCodes::CantOpen; return CantOpen;
std::vector< std::string > tokens; std::vector< std::string > tokens;
TokenizeNextLine(stream, tokens); TokenizeNextLine(stream, tokens);
@ -151,7 +155,7 @@ namespace vcg
for (unsigned int i=0; i<nVertices; i++, v_iter++) for (unsigned int i=0; i<nVertices; i++, v_iter++)
{ {
if (stream.fail()) if (stream.fail())
return OFFCodes::UnexpectedEOF; return UnexpectedEOF;
TokenizeNextLine(stream, tokens); TokenizeNextLine(stream, tokens);
for (unsigned int j=0; j<3; j++) for (unsigned int j=0; j<3; j++)
@ -172,7 +176,7 @@ namespace vcg
{ {
f0 = f; f0 = f;
if (stream.fail()) if (stream.fail())
return OFFCodes::UnexpectedEOF; return UnexpectedEOF;
TokenizeNextLine(stream, tokens); TokenizeNextLine(stream, tokens);
@ -271,7 +275,7 @@ namespace vcg
} // end if (isColorDefined) } // end if (isColorDefined)
} }
return OFFCodes::NoError; return NoError;
} // end Open } // end Open
@ -477,4 +481,4 @@ namespace vcg
};//namespace tri };//namespace tri
}; // namespace vcg }; // namespace vcg
#endif //__VCGLIB_IMPORT_OFF #endif //__VCGLIB_IMPORT_OFF