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

Clean AppPartPy.cpp

Browse Source 
Python version is always greater than 3.9
This commit is contained in:
mosfet80
2025-02-25 17:12:10 +01:00
committed by Chris Hennes
parent cdfa386f87
commit 54f43eb501
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Part/App/AppPartPy.cpp
View File

@@ -720,7 +720,6 @@ private:
std::string EncodedName = std::string(Name);
PyMem_Free(Name);
//Base::Console().Log("Open in Part with %s",Name);
Base::FileInfo file(EncodedName.c_str());
// extract ending
@@ -2015,9 +2014,7 @@ private:
}
pysize = PyUnicode_GetLength(p);
#if PY_VERSION_HEX < 0x03090000
unichars = PyUnicode_AS_UNICODE(p);
#else
#ifdef FC_OS_WIN32
//PyUNICODE is only 16 bits on Windows (wchar_t), so passing 32 bit UCS4
//will result in unknown glyph in even positions, and wrong characters in
@@ -2025,15 +2022,12 @@ private:
unichars = (Py_UNICODE*)PyUnicode_AsWideCharString(p, &pysize);
#else
unichars = (Py_UNICODE *)PyUnicode_AsUCS4Copy(p);
#endif
#endif
}
else if (PyUnicode_Check(intext)) {
pysize = PyUnicode_GetLength(intext);
#if PY_VERSION_HEX < 0x03090000
unichars = PyUnicode_AS_UNICODE(intext);
#else
#ifdef FC_OS_WIN32
//PyUNICODE is only 16 bits on Windows (wchar_t), so passing 32 bit UCS4
//will result in unknown glyph in even positions, and wrong characters in
@@ -2041,7 +2035,6 @@ private:
unichars = (Py_UNICODE*)PyUnicode_AsWideCharString(intext, &pysize);
#else
unichars = (Py_UNICODE *)PyUnicode_AsUCS4Copy(intext);
#endif
#endif
}
else {
@@ -2055,11 +2048,9 @@ private:
else {
CharList = FT2FC(unichars,pysize,dir,fontfile,height,track);
}
#if PY_VERSION_HEX >= 0x03090000
if (unichars) {
PyMem_Free(unichars);
}
#endif
}
catch (Standard_DomainError&) { // Standard_DomainError is OCC error.
throw Py::Exception(PartExceptionOCCDomainError, "makeWireString failed - Standard_DomainError");