python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 18:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1673 from radarhere/jpeg

Browse Source 
Updated jpeg to 9b
This commit is contained in:
wiredfool 2016-01-31 09:05:12 -08:00
commit 9d9a995c72
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winbuild/config.py
View File

@ -18,9 +18,9 @@ libs = {
'dir': 'zlib-1.2.8', 'dir': 'zlib-1.2.8',
}, },
'jpeg': { 'jpeg': {
'url': 'http://www.ijg.org/files/jpegsr9a.zip', 'url': 'http://www.ijg.org/files/jpegsr9b.zip',
'hash': 'md5:a34f3c82760270ee1e1885b15b90a72e', # not found - generated by wiredfool 'hash': 'md5:a21b8024d78ba05857a75272b4fa95ec', # not found - generated by wiredfool
'dir': 'jpeg-9a', 'dir': 'jpeg-9b',
}, },
'tiff': { 'tiff': {
'url': 'ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.6.zip', 'url': 'ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.6.zip',

22
winbuild/nmake.opt
View File

@ -2,23 +2,23 @@
# #
# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu> # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
# #
# Permission to use, copy, modify, distribute, and sell this software and # Permission to use, copy, modify, distribute, and sell this software and
# its documentation for any purpose is hereby granted without fee, provided # its documentation for any purpose is hereby granted without fee, provided
# that (i) the above copyright notices and this permission notice appear in # that (i) the above copyright notices and this permission notice appear in
# all copies of the software and related documentation, and (ii) the names of # all copies of the software and related documentation, and (ii) the names of
# Sam Leffler and Silicon Graphics may not be used in any advertising or # Sam Leffler and Silicon Graphics may not be used in any advertising or
# publicity relating to the software without the specific, prior written # publicity relating to the software without the specific, prior written
# permission of Sam Leffler and Silicon Graphics. # permission of Sam Leffler and Silicon Graphics.
# #
# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, # THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY # EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. # WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
# #
# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR # IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, # ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, # OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF # WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE. # OF THIS SOFTWARE.
# Compile time parameters for MS Visual C++ compiler. # Compile time parameters for MS Visual C++ compiler.
@ -28,7 +28,7 @@
###### Edit the following lines to choose a feature set you need. ####### ###### Edit the following lines to choose a feature set you need. #######
# #
# #
# Select WINMODE_CONSOLE to build a library which reports errors to stderr, or # Select WINMODE_CONSOLE to build a library which reports errors to stderr, or
# WINMODE_WINDOWED to build such that errors are reported via MessageBox(). # WINMODE_WINDOWED to build such that errors are reported via MessageBox().
# #
@ -55,7 +55,7 @@ LOGLUV_SUPPORT = 1
# Uncomment and edit following lines to enable JPEG support. # Uncomment and edit following lines to enable JPEG support.
# #
JPEG_SUPPORT = 1 JPEG_SUPPORT = 1
JPEGDIR = $(BUILD)\jpeg-9a JPEGDIR = $(BUILD)\jpeg-9b
JPEG_INCLUDE = -I$(JPEGDIR) JPEG_INCLUDE = -I$(JPEGDIR)
JPEG_LIB = $(JPEGDIR)/libjpeg.lib JPEG_LIB = $(JPEGDIR)/libjpeg.lib
@ -115,7 +115,7 @@ CHECK_JPEG_YCBCR_SUBSAMPLING = 1
# NOTE: /EHsc option required if you want to build the C++ stream API # NOTE: /EHsc option required if you want to build the C++ stream API
# #
OPTFLAGS = /Ox /MD /EHsc /W3 /D_CRT_SECURE_NO_DEPRECATE OPTFLAGS = /Ox /MD /EHsc /W3 /D_CRT_SECURE_NO_DEPRECATE
#OPTFLAGS = /Zi #OPTFLAGS = /Zi
# #
# Uncomment following line to enable using Windows Common RunTime Library # Uncomment following line to enable using Windows Common RunTime Library