[Bf-blender-cvs] [8008dab] openvdb: Cleanup: reduce scopes of 'using namespace' declarations.
Kévin Dietrich
noreply at git.blender.org
Fri Jul 17 20:21:37 CEST 2015
Commit: 8008daba75cbe1b84d6e16a3aa9bc8a478ef3d01
Author: Kévin Dietrich
Date: Fri Jul 17 19:59:49 2015 +0200
Branches: openvdb
https://developer.blender.org/rB8008daba75cbe1b84d6e16a3aa9bc8a478ef3d01
Cleanup: reduce scopes of 'using namespace' declarations.
===================================================================
M intern/openvdb/openvdb_capi.cpp
===================================================================
diff --git a/intern/openvdb/openvdb_capi.cpp b/intern/openvdb/openvdb_capi.cpp
index 0e604d1..ba29999 100644
--- a/intern/openvdb/openvdb_capi.cpp
+++ b/intern/openvdb/openvdb_capi.cpp
@@ -27,21 +27,21 @@
#include "openvdb_dense_convert.h"
#include "openvdb_util.h"
-using namespace openvdb;
-
struct OpenVDBFloatGrid { int unused; };
struct OpenVDBIntGrid { int unused; };
struct OpenVDBVectorGrid { int unused; };
int OpenVDB_getVersionHex()
{
- return OPENVDB_LIBRARY_VERSION;
+ return openvdb::OPENVDB_LIBRARY_VERSION;
}
void OpenVDB_get_grid_info(const char *filename, OpenVDBGridInfoCallback cb, void *userdata)
{
Timer(__func__);
+ using namespace openvdb;
+
int ret = OPENVDB_NO_ERROR;
initialize();
@@ -76,6 +76,8 @@ OpenVDBFloatGrid *OpenVDB_export_grid_fl(OpenVDBWriter *writer,
{
Timer(__func__);
+ using namespace openvdb;
+
OpenVDBFloatGrid *grid =
(OpenVDBFloatGrid *)internal::OpenVDB_export_grid<FloatGrid>(writer, name, data, res, matrix, (FloatGrid *)mask);
return grid;
@@ -88,6 +90,8 @@ OpenVDBIntGrid *OpenVDB_export_grid_ch(OpenVDBWriter *writer,
{
Timer(__func__);
+ using namespace openvdb;
+
OpenVDBIntGrid *grid =
(OpenVDBIntGrid *)internal::OpenVDB_export_grid<Int32Grid>(writer, name, data, res, matrix, (FloatGrid *)mask);
return grid;
@@ -101,10 +105,12 @@ OpenVDBVectorGrid *OpenVDB_export_grid_vec(struct OpenVDBWriter *writer,
{
Timer(__func__);
+ using namespace openvdb;
+
OpenVDBVectorGrid *grid =
(OpenVDBVectorGrid *)internal::OpenVDB_export_vector_grid(writer, name,
data_x, data_y, data_z, res, matrix,
- static_cast<openvdb::VecType>(vec_type),
+ static_cast<VecType>(vec_type),
is_color, (FloatGrid *)mask);
return grid;
}
@@ -115,14 +121,14 @@ void OpenVDB_import_grid_fl(OpenVDBReader *reader,
{
Timer(__func__);
- internal::OpenVDB_import_grid<FloatGrid>(reader, name, data, res);
+ internal::OpenVDB_import_grid<openvdb::FloatGrid>(reader, name, data, res);
}
void OpenVDB_import_grid_ch(OpenVDBReader *reader,
const char *name, unsigned char **data,
const int res[3])
{
- internal::OpenVDB_import_grid<Int32Grid>(reader, name, data, res);
+ internal::OpenVDB_import_grid<openvdb::Int32Grid>(reader, name, data, res);
}
void OpenVDB_import_grid_vec(struct OpenVDBReader *reader,
@@ -148,6 +154,8 @@ void OpenVDBWriter_free(OpenVDBWriter *writer)
void OpenVDBWriter_set_flags(OpenVDBWriter *writer, const int flag, const bool half)
{
+ using namespace openvdb;
+
int compression_flags = io::COMPRESS_ACTIVE_MASK;
if (flag == 0) {
More information about the Bf-blender-cvs
mailing list