haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relaxed VRML1 parsing rules to support yet more non-compliant models

This commit is contained in:
Cirilo Bernardo 2016-02-22 09:42:47 +11:00
parent 5776037a70
commit 52e093087e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/3d/vrml/v1/vrml1_base.cpp
View File

@ -146,7 +146,7 @@ bool WRL1BASE::Read( WRLPROC& proc )
// Note: according to the VRML1 specification, a file may contain
// only one grouping node at the top level. The following code
// supports non-conformant VRML1 files by processing all top level
// grouping nodes.
// grouping nodes and ignoring any top-level non-grouping nodes.
while( proc.ReadName( glob ) )
{
@ -188,7 +188,19 @@ bool WRL1BASE::Read( WRLPROC& proc )
std::cerr << " * [INFO] bad file - top node is not a Separator, Switch, or Group\n";
#endif
return false;
if( !proc.DiscardNode() )
{
#if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 1 )
std::cerr << proc.GetError() << "\n";
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [INFO] could not discard node at line " << line;
std::cerr << ", column " << column << "\n";
#endif
return false;
}
continue;
}
switch( ntype )