python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2026-02-05 14:59:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into jxl-support2

Browse Source
This commit is contained in:
Andrew Murray 2025-12-24 17:20:27 +11:00 committed by GitHub
commit 7906f57589
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,15 +31,16 @@ env:
jobs:
build:
runs-on: windows-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: ["pypy3.11", "3.11", "3.12", "3.13", "3.14", "3.15"]
architecture: ["x64"]
os: ["windows-latest"]
include:
# Test the oldest Python on 32-bit
- { python-version: "3.10", architecture: "x86" }
- { python-version: "3.10", architecture: "x86", os: "windows-2022" }
timeout-minutes: 45

4
docs/installation/platform-support.rst
View File

@ -53,8 +53,8 @@ These platforms are built and tested for every change.
| | | s390x |
+----------------------------------+----------------------------+---------------------+
| Windows Server 2022 | 3.10 | x86 |
| +----------------------------+---------------------+
| | 3.11, 3.12, 3.13, 3.14, | x86-64 |
+----------------------------------+----------------------------+---------------------+
| Windows Server 2025 | 3.11, 3.12, 3.13, 3.14, | x86-64 |
| | PyPy3 | |
| +----------------------------+---------------------+
| | 3.12 (MinGW) | x86-64 |

1
pyproject.toml
View File

@ -42,7 +42,6 @@ dynamic = [
"version",
]
optional-dependencies.docs = [
"docutils==0.21", # Pending https://github.com/pradyunsg/sphinx-inline-tabs/pull/51
"furo",
"olefile",
"sphinx>=8.2",

2
src/libImaging/BcnDecode.c
View File

@ -663,7 +663,7 @@ half_to_float(UINT16 h) {
if (o.f >= m.f) {
o.u |= 255 << 23;
}
o.u |= (h & 0x8000) << 16;
o.u |= (UINT32)(h & 0x8000) << 16;
return o.f;
}

3
winbuild/README.md
View File

@ -11,7 +11,8 @@ For more extensive info, see the [Windows build instructions](build.rst).
* Requires Microsoft Visual Studio 2017 or newer with C++ component.
* Requires NASM for libjpeg-turbo, a required dependency when using this script.
* Requires CMake 3.15 or newer (available as Visual Studio component).
* Tested on Windows Server 2022 with Visual Studio 2022 Enterprise (GitHub Actions).
* Tested on Windows Server 2025 and 2022 with Visual Studio 2022 Enterprise (GitHub
Actions).
Here's an example script to build on Windows: