Merge pull request #72 from DaveGargan/devel

In PLY import consume comments that appear before format header
This commit is contained in:
Alessandro Muntoni 2020-03-30 11:02:12 +02:00 committed by GitHub
commit 076f6bcbb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions

View File

@ -1052,6 +1052,24 @@ int PlyFile::OpenRead( const char * filename )
error = E_UNESPECTEDEOF;
goto error;
}
while (!strcmp(token, COMMENT))
{
comments.push_back(string(token + strlen(token) + 1));
if (pb_fgets(buf, MAXB - 1, gzfp) == 0)
{
error = E_UNESPECTEDEOF;
goto error;
}
header.append(buf);
#ifdef __MINGW32__
token = strtok(buf, SEP);
#else
token = strtok_r(buf, SEP, &tokenPtr);
#endif
}
if( strcmp(token,FORMAT) )
{
error = E_NOFORMAT;