python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-27 17:30:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into libpng

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

4
.github/workflows/wheels-dependencies.sh vendored
View File

@ -18,7 +18,7 @@ ARCHIVE_SDIR=pillow-depends-main
FREETYPE_VERSION=2.13.2 FREETYPE_VERSION=2.13.2
HARFBUZZ_VERSION=8.3.0 HARFBUZZ_VERSION=8.3.0
LIBPNG_VERSION=1.6.43 LIBPNG_VERSION=1.6.43
JPEGTURBO_VERSION=3.0.1 JPEGTURBO_VERSION=3.0.2
OPENJPEG_VERSION=2.5.2 OPENJPEG_VERSION=2.5.2
XZ_VERSION=5.4.5 XZ_VERSION=5.4.5
TIFF_VERSION=4.6.0 TIFF_VERSION=4.6.0
@ -29,7 +29,7 @@ else
GIFLIB_VERSION=5.2.1 GIFLIB_VERSION=5.2.1
fi fi
if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
ZLIB_VERSION=1.3 ZLIB_VERSION=1.3.1
else else
ZLIB_VERSION=1.2.8 ZLIB_VERSION=1.2.8
fi fi

3
CHANGES.rst
View File

@ -5,6 +5,9 @@ Changelog (Pillow)
10.3.0 (unreleased) 10.3.0 (unreleased)
------------------- -------------------
- Fix shift-sign issue in Convert.c #7838
[r-barnes, radarhere]
- Open 16-bit grayscale PNGs as I;16 #7849 - Open 16-bit grayscale PNGs as I;16 #7849
[radarhere] [radarhere]

2
src/libImaging/Convert.c
View File

@ -510,7 +510,7 @@ rgbT2rgba(UINT8 *out, int xsize, int r, int g, int b) {
UINT32 trns = ((r & 0xff) << 24) | ((g & 0xff) << 16) | ((b & 0xff) << 8) | 0xff; UINT32 trns = ((r & 0xff) << 24) | ((g & 0xff) << 16) | ((b & 0xff) << 8) | 0xff;
UINT32 repl = trns & 0xffffff00; UINT32 repl = trns & 0xffffff00;
#else #else
UINT32 trns = (0xff << 24) | ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff); UINT32 trns = (0xffU << 24) | ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
UINT32 repl = trns & 0x00ffffff; UINT32 repl = trns & 0x00ffffff;
#endif #endif

4
winbuild/build_prepare.py
View File

@ -114,14 +114,14 @@ V = {
"FREETYPE": "2.13.2", "FREETYPE": "2.13.2",
"FRIBIDI": "1.0.13", "FRIBIDI": "1.0.13",
"HARFBUZZ": "8.3.0", "HARFBUZZ": "8.3.0",
"JPEGTURBO": "3.0.1", "JPEGTURBO": "3.0.2",
"LCMS2": "2.16", "LCMS2": "2.16",
"LIBPNG": "1.6.43", "LIBPNG": "1.6.43",
"LIBWEBP": "1.3.2", "LIBWEBP": "1.3.2",
"OPENJPEG": "2.5.2", "OPENJPEG": "2.5.2",
"TIFF": "4.6.0", "TIFF": "4.6.0",
"XZ": "5.4.5", "XZ": "5.4.5",
"ZLIB": "1.3", "ZLIB": "1.3.1",
} }
V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "") V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "")
V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2]) V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])