From b1b20d81f4a163c8995d4520565e5687049d35a0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 12 Jan 2020 22:43:39 +1100 Subject: [PATCH] Updated libjpeg to 9d --- .github/workflows/test-windows.yml | 2 +- docs/installation.rst | 2 +- winbuild/config.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index a67f678ae54..ff438e37c82 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -106,7 +106,7 @@ jobs: set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32 set BUILD=%GITHUB_WORKSPACE%\winbuild\build - cd /D %BUILD%\jpeg-9c + cd /D %BUILD%\jpeg-9d call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }} echo on nmake -nologo -f makefile.vc setup-vc6 diff --git a/docs/installation.rst b/docs/installation.rst index 24b88871211..575e2937f46 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -137,7 +137,7 @@ Many of Pillow's features require external libraries: * **libjpeg** provides JPEG functionality. - * Pillow has been tested with libjpeg versions **6b**, **8**, **9-9c** and + * Pillow has been tested with libjpeg versions **6b**, **8**, **9-9d** and libjpeg-turbo version **8**. * Starting with Pillow 3.0.0, libjpeg is required by default, but may be disabled with the ``--disable-jpeg`` flag. diff --git a/winbuild/config.py b/winbuild/config.py index c6b53eab945..f9b23b4ffc2 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -30,9 +30,9 @@ "dir": "zlib-1.2.11", }, "jpeg": { - "url": "http://www.ijg.org/files/jpegsr9c.zip", - "filename": "jpegsr9c.zip", - "dir": "jpeg-9c", + "url": "http://www.ijg.org/files/jpegsr9d.zip", + "filename": "jpegsr9d.zip", + "dir": "jpeg-9d", }, "tiff": { "url": "ftp://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz",