Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 23:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Defer header initialization to aafter storage is set - cfr dcebf23a

Browse Source
This commit is contained in:
Thomas Krijnen
2026-07-28 03:08:55 +02:00
parent 5739a24808
commit e122f2cec3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/parse.cpp
+8 -6
View File
@@ -1658,8 +1658,7 @@ file::file(const std::string& fn, bool mmap, ::logger& log)
: logger_(log) : logger_(log)
, schema_(nullptr) , schema_(nullptr)
, ifcroot_type_(nullptr) , ifcroot_type_(nullptr)
, max_id_(0) , max_id_(0) {
, header_(new spf_header(this, &logger_.get())) {
initialize(fn, mmap); initialize(fn, mmap);
} }
@@ -1682,12 +1681,13 @@ bool ifcopenshell::file::initialize(const std::string& fn, bool mmap) {
} }
ifcroot_type_ = schema_ ? schema_->declaration_by_name("IfcRoot") : nullptr; ifcroot_type_ = schema_ ? schema_->declaration_by_name("IfcRoot") : nullptr;
header_.reset(new spf_header(this, &logger_.get()));
return good_ == file_open_status::SUCCESS; return good_ == file_open_status::SUCCESS;
} }
#endif #endif
file::file(const uninitialized_tag&, ::logger& log) file::file(const uninitialized_tag&, ::logger& log)
: good_(file_open_status::UNKNOWN), logger_(log), schema_(nullptr), ifcroot_type_(nullptr), max_id_(0), header_(new ifcopenshell::spf_header(this, &logger_.get())) {} : good_(file_open_status::UNKNOWN), logger_(log), schema_(nullptr), ifcroot_type_(nullptr), max_id_(0), header_(nullptr) {}
bool ifcopenshell::file::initialize(const std::string& path, filetype ty, bool readonly) { bool ifcopenshell::file::initialize(const std::string& path, filetype ty, bool readonly) {
if (ty == FT_AUTODETECT) { if (ty == FT_AUTODETECT) {
@@ -1732,6 +1732,7 @@ bool ifcopenshell::file::initialize(const std::string& path, filetype ty, bool r
// throw std::runtime_error("Unsupported file format"); // throw std::runtime_error("Unsupported file format");
} }
ifcroot_type_ = schema_ ? schema_->declaration_by_name("IfcRoot") : nullptr; ifcroot_type_ = schema_ ? schema_->declaration_by_name("IfcRoot") : nullptr;
header_.reset(new spf_header(this, &logger_.get()));
return good_ == file_open_status::SUCCESS; return good_ == file_open_status::SUCCESS;
} }
@@ -1744,7 +1745,6 @@ file::file(const std::string& path, filetype ty, bool readonly, ::logger& log)
, schema_(nullptr) , schema_(nullptr)
, ifcroot_type_(nullptr) , ifcroot_type_(nullptr)
, max_id_(0) , max_id_(0)
, header_(new spf_header(this, &logger_.get()))
{ {
initialize(path, ty, readonly); initialize(path, ty, readonly);
} }
@@ -1754,7 +1754,6 @@ file::file(std::istream& stream, int length, ::logger& log)
, schema_(nullptr) , schema_(nullptr)
, ifcroot_type_(nullptr) , ifcroot_type_(nullptr)
, max_id_(0) , max_id_(0)
, header_(new ifcopenshell::spf_header(this, &logger_.get()))
{ {
file_reader<pushed_sequential_impl> s(caller_fed_tag{}); file_reader<pushed_sequential_impl> s(caller_fed_tag{});
@@ -1771,6 +1770,8 @@ file::file(std::istream& stream, int length, ::logger& log)
byid_ = decltype(byid_)(&std::get<impl::in_memory_file_storage>(storage_).byid_read_); byid_ = decltype(byid_)(&std::get<impl::in_memory_file_storage>(storage_).byid_read_);
byref_excl_ = decltype(byref_excl_)(&std::get<impl::in_memory_file_storage>(storage_).byref_excl_); byref_excl_ = decltype(byref_excl_)(&std::get<impl::in_memory_file_storage>(storage_).byref_excl_);
byguid_ = decltype(byguid_)(&std::get<impl::in_memory_file_storage>(storage_).byguid_); byguid_ = decltype(byguid_)(&std::get<impl::in_memory_file_storage>(storage_).byguid_);
header_.reset(new spf_header(this, &logger_.get()));
} }
file::file(void* data, int length, ::logger& log) file::file(void* data, int length, ::logger& log)
@@ -1778,7 +1779,6 @@ file::file(void* data, int length, ::logger& log)
, schema_(nullptr) , schema_(nullptr)
, ifcroot_type_(nullptr) , ifcroot_type_(nullptr)
, max_id_(0) , max_id_(0)
, header_(new ifcopenshell::spf_header(this, &logger_.get()))
{ {
file_reader<pushed_sequential_impl> s(std::string((char*)data, length), caller_fed_tag{}); file_reader<pushed_sequential_impl> s(std::string((char*)data, length), caller_fed_tag{});
@@ -1790,6 +1790,8 @@ file::file(void* data, int length, ::logger& log)
byid_ = decltype(byid_)(&std::get<impl::in_memory_file_storage>(storage_).byid_read_); byid_ = decltype(byid_)(&std::get<impl::in_memory_file_storage>(storage_).byid_read_);
byref_excl_ = decltype(byref_excl_)(&std::get<impl::in_memory_file_storage>(storage_).byref_excl_); byref_excl_ = decltype(byref_excl_)(&std::get<impl::in_memory_file_storage>(storage_).byref_excl_);
byguid_ = decltype(byguid_)(&std::get<impl::in_memory_file_storage>(storage_).byguid_); byguid_ = decltype(byguid_)(&std::get<impl::in_memory_file_storage>(storage_).byguid_);
header_.reset(new spf_header(this, &logger_.get()));
} }
file::file(const ifcopenshell::schema_definition* schema, filetype ty, const std::string& path, ::logger& log) file::file(const ifcopenshell::schema_definition* schema, filetype ty, const std::string& path, ::logger& log)