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

fix unicode problem when reading or writing mesh object

Browse Source
This commit is contained in:
wmayer 2016-10-01 20:41:00 +02:00
parent 3de44dfcd7
commit ec624b91d7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Mesh/App/MeshPyImp.cpp
View File

@ -135,9 +135,10 @@ PyObject* MeshPy::copy(PyObject *args)
PyObject* MeshPy::read(PyObject *args) PyObject* MeshPy::read(PyObject *args)
{ {
const char* Name; char* Name;
if (PyArg_ParseTuple(args, "s",&Name)) { if (PyArg_ParseTuple(args, "et", "utf-8", &Name)) {
getMeshObjectPtr()->load(Name); getMeshObjectPtr()->load(Name);
PyMem_Free(Name);
Py_Return; Py_Return;
} }
@ -183,7 +184,7 @@ PyObject* MeshPy::read(PyObject *args)
PyObject* MeshPy::write(PyObject *args) PyObject* MeshPy::write(PyObject *args)
{ {
const char* Name; char* Name;
char* Ext=0; char* Ext=0;
char* ObjName=0; char* ObjName=0;
PyObject* List=0; PyObject* List=0;
@ -206,7 +207,7 @@ PyObject* MeshPy::write(PyObject *args)
ext["APLY"] = MeshCore::MeshIO::APLY; ext["APLY"] = MeshCore::MeshIO::APLY;
ext["PY" ] = MeshCore::MeshIO::PY; ext["PY" ] = MeshCore::MeshIO::PY;
if (PyArg_ParseTuple(args, "s|ssO!",&Name,&Ext,&ObjName,&PyList_Type,&List)) { if (PyArg_ParseTuple(args, "et|ssO!","utf-8",&Name,&Ext,&ObjName,&PyList_Type,&List)) {
if (Ext && ext.find(Ext) != ext.end()) { if (Ext && ext.find(Ext) != ext.end()) {
format = ext[Ext]; format = ext[Ext];
} }
@ -234,6 +235,7 @@ PyObject* MeshPy::write(PyObject *args)
getMeshObjectPtr()->save(Name, format, 0, ObjName); getMeshObjectPtr()->save(Name, format, 0, ObjName);
} }
PyMem_Free(Name);
Py_Return; Py_Return;
} }