Skip to content

Commit

Permalink
Merge b1b20d8 into b40141f
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Jan 12, 2020
2 parents b40141f + b1b20d8 commit 9728529
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions winbuild/config.py
Expand Up @@ -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",
Expand Down

0 comments on commit 9728529

Please sign in to comment.