Merge branch 'main' into libpng

python-pillow · Mar 9, 2024 · dfc6443 · dfc6443
2 parents 89648ae + 90767af
commit dfc6443
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
@@ -18,7 +18,7 @@ ARCHIVE_SDIR=pillow-depends-main
 FREETYPE_VERSION=2.13.2
 HARFBUZZ_VERSION=8.3.0
 LIBPNG_VERSION=1.6.43
-JPEGTURBO_VERSION=3.0.1
+JPEGTURBO_VERSION=3.0.2
 OPENJPEG_VERSION=2.5.2
 XZ_VERSION=5.4.5
 TIFF_VERSION=4.6.0
@@ -29,7 +29,7 @@ else
     GIFLIB_VERSION=5.2.1
 fi
 if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
-    ZLIB_VERSION=1.3
+    ZLIB_VERSION=1.3.1
 else
     ZLIB_VERSION=1.2.8
 fi

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

diff --git a/src/libImaging/Convert.c b/src/libImaging/Convert.c
@@ -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 repl = trns & 0xffffff00;
 #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;
 #endif
 

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