Updated libjpeg to 9d

This commit is contained in:
Andrew Murray 2020-01-12 22:43:39 +11:00
parent b40141fb7d
commit b1b20d81f4
3 changed files with 5 additions and 5 deletions

View File

@ -106,7 +106,7 @@ jobs:
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
set BUILD=%GITHUB_WORKSPACE%\winbuild\build 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 }} call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }}
echo on echo on
nmake -nologo -f makefile.vc setup-vc6 nmake -nologo -f makefile.vc setup-vc6

View File

@ -137,7 +137,7 @@ Many of Pillow's features require external libraries:
* **libjpeg** provides JPEG functionality. * **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**. libjpeg-turbo version **8**.
* Starting with Pillow 3.0.0, libjpeg is required by default, but * Starting with Pillow 3.0.0, libjpeg is required by default, but
may be disabled with the ``--disable-jpeg`` flag. may be disabled with the ``--disable-jpeg`` flag.

View File

@ -30,9 +30,9 @@ libs = {
"dir": "zlib-1.2.11", "dir": "zlib-1.2.11",
}, },
"jpeg": { "jpeg": {
"url": "http://www.ijg.org/files/jpegsr9c.zip", "url": "http://www.ijg.org/files/jpegsr9d.zip",
"filename": "jpegsr9c.zip", "filename": "jpegsr9d.zip",
"dir": "jpeg-9c", "dir": "jpeg-9d",
}, },
"tiff": { "tiff": {
"url": "ftp://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz", "url": "ftp://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz",