Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-11 10:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.6.0

Browse Source 
# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomRenderStyles.cpp
#	src/ifcparse/IfcParse.cpp
This commit is contained in:
Thomas Krijnen
2018-10-30 14:32:28 +01:00
parent cb535b4ba8 e64d8750e1
commit ad41f04f11
8 changed files with 149 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcParse.cpp
+5 -9
View File
@@ -1320,8 +1320,6 @@ void IfcFile::initialize_(IfcParse::IfcSpfStream* s) {
return;
}
good_ = true;
tokens = new IfcSpfLexer(stream, this);
_header.file(this);
_header.tryRead();
@@ -1339,18 +1337,16 @@ void IfcFile::initialize_(IfcParse::IfcSpfStream* s) {
} catch (const IfcParse::IfcException& e) {
Logger::Error(e);
}
if (schema_ == 0 && schemas.front().substr(0, 4) == "IFC2") {
Logger::Message(Logger::LOG_ERROR, schemas.front() + " not supported, using IFC2X3 instead");
schema_ = IfcParse::schema_by_name("IFC2X3");
}
}
if (schema_ == 0) {
schema_ = IfcParse::schema_by_name("IFC4");
Logger::Message(Logger::LOG_ERROR, "Unable to deduce schema version from header identifiers, defaulting to IFC4");
Logger::Message(Logger::LOG_ERROR, "No support for file schema encountered ("
+ boost::algorithm::join(schemas, ", ") + ")");
return;
}
good_ = true;
ifcroot_type_ = schema_->declaration_by_name("IfcRoot");
boost::circular_buffer<Token> token_stream(3, Token());