archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fixed memory leaks in passing vectors from Python to C++.

Browse Source
This commit is contained in:
Tamito Kajiyama
2009-03-13 19:27:00 +00:00
parent 2fbcd6c4bd
commit c8ac7723d6
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/blender/freestyle/intern/python/BPy_Convert.cpp
View File

@@ -332,24 +332,49 @@ Nature::EdgeNature EdgeNature_from_BPy_Nature( PyObject* obj ) {
}
Vec2f * Vec2f_ptr_from_Vector( PyObject* obj ) {
float x = PyFloat_AsDouble( PyObject_GetAttrString(obj,"x") );
float y = PyFloat_AsDouble( PyObject_GetAttrString(obj,"y") );
PyObject *v;
if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 2)
return NULL;
v = PyObject_GetAttrString(obj,"x");
float x = PyFloat_AsDouble( v );
Py_DECREF( v );
v = PyObject_GetAttrString(obj,"y");
float y = PyFloat_AsDouble( v );
Py_DECREF( v );
return new Vec2f(x,y);
}
Vec3f * Vec3f_ptr_from_Vector( PyObject* obj ) {
float x = PyFloat_AsDouble( PyObject_GetAttrString(obj,"x") );
float y = PyFloat_AsDouble( PyObject_GetAttrString(obj,"y") );
float z = PyFloat_AsDouble( PyObject_GetAttrString(obj,"z") );
PyObject *v;
if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3)
return NULL;
v = PyObject_GetAttrString(obj,"x");
float x = PyFloat_AsDouble( v );
Py_DECREF( v );
v = PyObject_GetAttrString(obj,"y");
float y = PyFloat_AsDouble( v );
Py_DECREF( v );
v = PyObject_GetAttrString(obj,"z");
float z = PyFloat_AsDouble( v );
Py_DECREF( v );
return new Vec3f(x,y,z);
}
Vec3r * Vec3r_ptr_from_Vector( PyObject* obj ) {
double x = PyFloat_AsDouble( PyObject_GetAttrString(obj,"x") );
double y = PyFloat_AsDouble( PyObject_GetAttrString(obj,"y") );
double z = PyFloat_AsDouble( PyObject_GetAttrString(obj,"z") );
PyObject *v;
if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3)
return NULL;
v = PyObject_GetAttrString(obj,"x");
double x = PyFloat_AsDouble( v );
Py_DECREF( v );
v = PyObject_GetAttrString(obj,"y");
double y = PyFloat_AsDouble( v );
Py_DECREF( v );
v = PyObject_GetAttrString(obj,"z");
double z = PyFloat_AsDouble( v );
Py_DECREF( v );
return new Vec3r(x,y,z);
}