suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support of unicode for doc string, fix memory leak

Browse Source
This commit is contained in:
wmayer 2016-09-07 12:18:57 +02:00
parent 50d0eae513
commit 52aef7348f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/FeaturePythonPyImp.inl
View File

@ -335,8 +335,11 @@ PyObject* FeaturePythonPyT<FeaturePyT>::addProperty(PyObject *args)
&PyBool_Type, &ro, &PyBool_Type, &hd)) // convert args: Python->C
return NULL; // NULL triggers exception
std::string sDocStr = std::string(sDoc);
PyMem_Free(sDoc);
Property* prop=0;
prop = FeaturePyT::getDocumentObjectPtr()->addDynamicProperty(sType,sName,sGroup,sDoc,attr,
prop = FeaturePyT::getDocumentObjectPtr()->addDynamicProperty(sType,sName,sGroup,sDocStr.c_str(),attr,
PyObject_IsTrue(ro) ? true : false, PyObject_IsTrue(hd) ? true : false);
if (!prop) {

7
src/Gui/ViewProviderPythonFeaturePyImp.cpp
View File

@ -68,12 +68,15 @@ PyObject* ViewProviderPythonFeaturePy::addProperty(PyObject *args)
char *sType,*sName=0,*sGroup=0,*sDoc=0;
short attr=0;
PyObject *ro = Py_False, *hd = Py_False;
if (!PyArg_ParseTuple(args, "s|ssshO!O!", &sType,&sName,&sGroup,&sDoc,&attr,
if (!PyArg_ParseTuple(args, "s|ssethO!O!", &sType,&sName,&sGroup,"utf-8",&sDoc,&attr,
&PyBool_Type, &ro, &PyBool_Type, &hd)) // convert args: Python->C
return NULL; // NULL triggers exception
std::string sDocStr = std::string(sDoc);
PyMem_Free(sDoc);
App::Property* prop=0;
prop = getViewProviderPythonFeaturePtr()->addDynamicProperty(sType,sName,sGroup,sDoc,attr,
prop = getViewProviderPythonFeaturePtr()->addDynamicProperty(sType,sName,sGroup,sDocStr.c_str(),attr,
PyObject_IsTrue(ro) ? true : false, PyObject_IsTrue(hd) ? true : false);
if (!prop) {