python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-05-31 19:23:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

raqm now works with PyPy on Windows

Browse Source
This commit is contained in:
nulano 2019-10-15 21:58:50 +01:00
parent 837d8ae984
commit 64317f8885
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test-windows.yml vendored
View File

@ -253,7 +253,6 @@ jobs:
# for Raqm # for Raqm
- name: Build dependencies / HarfBuzz - name: Build dependencies / HarfBuzz
if: "!contains(matrix.python-version, 'pypy')"
run: | run: |
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32 set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
@ -274,7 +273,6 @@ jobs:
# for Raqm # for Raqm
- name: Build dependencies / FriBidi - name: Build dependencies / FriBidi
if: "!contains(matrix.python-version, 'pypy')"
run: | run: |
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32 set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
@ -292,9 +290,7 @@ jobs:
copy /Y /B *.lib %INCLIB% copy /Y /B *.lib %INCLIB%
shell: cmd shell: cmd
# failing with PyPy3
- name: Build dependencies / Raqm - name: Build dependencies / Raqm
if: "!contains(matrix.python-version, 'pypy')"
run: | run: |
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32 set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32

2
src/_imagingft.c
View File

@ -380,7 +380,7 @@ text_layout_raqm(PyObject* string, FontObject* self, const char* dir, PyObject *
and raqm fails with empty strings */ and raqm fails with empty strings */
goto failed; goto failed;
} }
int set_text = (*p_raqm.set_text)(rq, (const uint32_t *)(text), size); int set_text = (*p_raqm.set_text)(rq, text, size);
PyMem_Free(text); PyMem_Free(text);
if (!set_text) { if (!set_text) {
PyErr_SetString(PyExc_ValueError, "raqm_set_text() failed"); PyErr_SetString(PyExc_ValueError, "raqm_set_text() failed");