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

+ fixes #0001816: parseQuantity returns garbage

Browse Source
This commit is contained in:
wmayer 2014-11-04 14:51:19 +01:00
parent d66fc092e1
commit 5c84e47422
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Base/UnitsApiPy.cpp
View File

@ -131,12 +131,12 @@ PyObject* UnitsApi::sParseQuantity(PyObject * /*self*/, PyObject *args,PyObject
if (!PyArg_ParseTuple(args, "et", "utf-8", &pstr)) // convert args: Python->C
return NULL; // NULL triggers exception
Quantity rtn;
QString qstr = QString::fromUtf8(pstr);
PyMem_Free(pstr);
Quantity rtn;
QString qstr = QString::fromUtf8(pstr);
PyMem_Free(pstr);
try {
rtn = Quantity::parse(QString::fromLatin1(pstr));
}
rtn = Quantity::parse(qstr);
}
catch (const Base::Exception&) {
PyErr_Format(PyExc_IOError, "invalid unit expression \n");
return 0L;
@ -146,6 +146,5 @@ PyObject* UnitsApi::sParseQuantity(PyObject * /*self*/, PyObject *args,PyObject
return 0L;
}
return new QuantityPy(new Quantity(rtn));
return new QuantityPy(new Quantity(rtn));
}