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

Change stl reader behaviour on extension .stl , Don't check for the solid keyword explicitly

Browse Source
This commit is contained in:
Jan Möbius
2020-10-09 09:31:19 +02:00
parent 1c71cf568d
commit 2667c669c4
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/OpenMesh/Core/IO/reader/STLReader.cc
View File

@@ -451,32 +451,7 @@ _STLReader_::
check_stl_type(const std::string& _filename) const check_stl_type(const std::string& _filename) const
{ {
// open file // Check the file size if it matches the binary value given after the header.
std::ifstream ifs (_filename.c_str(), std::ifstream::binary);
if(!ifs.good())
{
omerr() << "could not open file" << _filename << std::endl;
return NONE;
}
//find first non whitespace character
std::string line = "";
std::size_t firstChar;
while(line.empty() && ifs.good())
{
std::getline(ifs,line);
firstChar = line.find_first_not_of("\t ");
}
//check for ascii keyword solid
if(strnicmp("solid",&line[firstChar],5) == 0)
{
return STLA;
}
ifs.close();
//if the file does not start with solid it is probably STLB
//check the file size to verify it.
//open the file //open the file
FILE* in = fopen(_filename.c_str(), "rb"); FILE* in = fopen(_filename.c_str(), "rb");
@@ -504,8 +479,8 @@ check_stl_type(const std::string& _filename) const
file_size += fread(dummy, 1, 100, in); file_size += fread(dummy, 1, 100, in);
fclose(in); fclose(in);
// if sizes match -> it's STLB // if sizes match -> it's STLB otherwise STLA is assumed
return (binary_size == file_size ? STLB : NONE); return (binary_size == file_size ? STLB : STLA);
} }