Commit: a788a91830555304c696871030acb6e5643ca4a2
Author: Kévin Dietrich
Date: Fri Jul 17 18:20:36 2015 +0200
Branches: openvdb
https://developer.blender.org/rBa788a91830555304c696871030acb6e5643ca4a2
OpenVDBReader: small de-duplication.
===================================================================
M intern/openvdb/intern/openvdb_reader.cpp
M intern/openvdb/intern/openvdb_reader.h
===================================================================
diff --git a/intern/openvdb/intern/openvdb_reader.cpp
b/intern/openvdb/intern/openvdb_reader.cpp
index 1ed080e..a4317a3 100644
--- a/intern/openvdb/intern/openvdb_reader.cpp
+++ b/intern/openvdb/intern/openvdb_reader.cpp
@@ -37,18 +37,12 @@ OpenVDBReader::OpenVDBReader()
OpenVDBReader::~OpenVDBReader()
{
- if (m_file) {
- m_file->close();
- delete m_file;
- }
+ cleanup_file();
}
void OpenVDBReader::open(const std::string &filename)
{
- if (m_file) {
- m_file->close();
- delete m_file;
- }
+ cleanup_file();
m_file = new openvdb::io::File(filename);
m_file->setCopyMaxBytes(COPY_MAX_BYTES);
@@ -105,3 +99,11 @@ size_t OpenVDBReader::numGrids() const
{
return m_file->getGrids()->size();
}
+
+void OpenVDBReader::cleanup_file()
+{
+ if (m_file) {
+ m_file->close();
+ delete m_file;
+ }
+}
diff --git a/intern/openvdb/intern/openvdb_reader.h
b/intern/openvdb/intern/openvdb_reader.h
index ae79b63..2fcf0e8 100644
--- a/intern/openvdb/intern/openvdb_reader.h
+++ b/intern/openvdb/intern/openvdb_reader.h
@@ -32,6 +32,8 @@ class OpenVDBReader {
openvdb::MetaMap::Ptr m_meta_map;
openvdb::io::File *m_file;
+ void cleanup_file();
+
public:
OpenVDBReader();
~OpenVDBReader();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
