kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: replace s# format unit with s*

Browse Source
This commit is contained in:
Maël Kerbiriou
2022-02-08 23:21:56 +01:00
committed by wwmayer
parent 2e48c62c37
commit 08c41ffb00
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/ApplicationPy.cpp
View File

@@ -1217,26 +1217,29 @@ PyObject* Application::sAddIconPath(PyObject * /*self*/, PyObject *args)
PyObject* Application::sAddIcon(PyObject * /*self*/, PyObject *args)
{
const char *iconName;
const char *content;
Py_ssize_t size = 0;
Py_buffer content;
const char *format = "XPM";
if (!PyArg_ParseTuple(args, "ss#|s", &iconName,&content,&size,&format))
if (!PyArg_ParseTuple(args, "ss*|s", &iconName, &content, &format))
return nullptr;
QPixmap icon;
if (BitmapFactory().findPixmapInCache(iconName, icon)) {
PyErr_SetString(PyExc_AssertionError, "Icon with this name already registered");
PyBuffer_Release(&content);
return nullptr;
}
QByteArray ary(content,size);
const char* contentStr = static_cast<const char*>(content.buf);
QByteArray ary(contentStr, content.len);
icon.loadFromData(ary, format);
if (icon.isNull()){
QString file = QString::fromUtf8(content);
QString file = QString::fromUtf8(contentStr, content.len);
icon.load(file);
}
PyBuffer_Release(&content);
if (icon.isNull()) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "Invalid icon added to application");
return nullptr;