Commit Graph

1804 Commits

Author SHA1 Message Date
wiredfool
3b227d1a05 Merge from current master 2014-05-20 11:47:53 -07:00
wiredfool
b3dcf849b8 Update 2014-05-24 12:46:55 +01:00
wiredfool
301cff0355 Merge pull request #670 from hugovk/png_clean
Rename variables not to use built-in function names
2014-05-24 12:46:12 +01:00
wiredfool
de28007585 Update CHANGES.rst [ci-skip] 2014-05-23 00:07:58 +01:00
wiredfool
cd17b66541 Merge pull request #647 from hugovk/house
Fix for junk JPEG data
2014-05-23 00:06:09 +01:00
hugovk
14c2f86873 Rename bytes variable as read_bytes to avoid the built-in function name. 2014-05-21 21:33:49 +03:00
hugovk
d594c0241a Rename len variables as length to avoid the built-in function name. 2014-05-21 20:45:02 +03:00
hugovk
8a7974c288 Use bytes for Python 3. It's just an alias to str in Python 2. 2014-05-21 14:35:29 +03:00
hugovk
0c1c620e30 Add test for #647. Fails without fix. 2014-05-21 14:33:28 +03:00
hugovk
aed2646dc2 pep8/pyflakes 2014-05-21 14:32:24 +03:00
hugovk
9c048e44d1 Permission to use and distribute (under the MIT license) this image as a testfile granted by cepreu2github: https://github.com/python-imaging/Pillow/issues/630#issuecomment-43674288 2014-05-21 14:30:05 +03:00
wiredfool
24cb7bf3df Updated changes [ci-skip] 2014-05-20 17:32:31 +01:00
wiredfool
47d38cc02b Merge pull request #668 from wiredfool/hugovk_pdf
Doc Update for Image.thumbnail
2014-05-20 17:29:40 +01:00
wiredfool
6ab636fb5a Doc formatting fix 2014-05-20 09:27:56 -07:00
wiredfool
9a6e8f8e9d Noted previous default 2014-05-20 09:21:12 -07:00
wiredfool
97ee7938cb Merge pull request #667 from wiredfool/hugovk_pdf
PDF Tests and Fixes merge
2014-05-20 17:18:34 +01:00
wiredfool
8d4a77a939 merge from master 2014-05-20 08:58:09 -07:00
wiredfool
d7c049504d Merge pull request #643 from CounterPillow/datatype-fix
Change unsigned INT16 to UINT16
2014-05-20 16:45:06 +01:00
wiredfool
b1c50df0c4 Merge pull request #662 from hugovk/nocoverpypy
Don't run coverage on PyPy jobs
2014-05-20 16:44:00 +01:00
wiredfool
a7cb81ec56 Update CHANGES.rst 2014-05-20 16:42:18 +01:00
wiredfool
fb164d0a6e Merge pull request #665 from hugovk/transparency
Remove transparency resource after converting P->RGBA, Fixes #664
2014-05-20 16:40:16 +01:00
Hugo
5c24952ee8 Merge pull request #2 from hugovk/master
Tweak for #664
2014-05-20 11:32:05 +03:00
Hugo
f8c5812154 Merge pull request #1 from wiredfool/p_rgba_transparency
Tweak for #664
2014-05-20 11:20:07 +03:00
wiredfool
88d74883bb remove redundant transparency check 2014-05-19 14:12:43 -07:00
hugovk
0938145e57 Move to an elif clause of the if in line 778, as it's just another combination of mode,self.mode under the master transparency condition 2014-05-19 10:04:56 +03:00
hugovk
a59bc40c38 flake8 2014-05-17 23:33:50 +03:00
hugovk
ca7608f1d5 Possible fix for #664 2014-05-17 20:36:17 +03:00
hugovk
55b1accb42 Add (failing) test for #664 2014-05-17 19:08:08 +03:00
Alex Clark
fc55580a69 Update 2014-05-14 05:59:48 -04:00
Alex Clark ☺
4adc589191 Merge pull request #652 from CounterPillow/windowshfix
Clean up preprocessor cruft for Windows
2014-05-14 05:58:45 -04:00
hugovk
6ca9e9d703 Keep PyPy first, it's still a little slower 2014-05-14 08:47:13 +03:00
hugovk
41d3c386a9 Don't cover PyPy: it fails intermittently and is x5.8 slower (#640) 2014-05-14 08:17:49 +03:00
hugovk
3ff73688fe pep8 and pyflakes 2014-05-12 14:56:55 +03:00
hugovk
8cda5170c8 Fix bytes/str and reinstate test 2014-05-12 14:45:54 +03:00
hugovk
c37aa0a9ca Fix tostring()/tobytes() warning and reinstate test 2014-05-12 14:30:03 +03:00
hugovk
bcb8534dcf Temporarily remove 'failing' 1-mode PDF test 2014-05-11 17:46:13 +03:00
hugovk
741297326a Temporarily remove 'failing' 1-mode PDF test 2014-05-11 17:41:07 +03:00
hugovk
6520004289 Add monochrome PDF test 2014-05-11 17:35:49 +03:00
hugovk
8f1a00ae92 Temporarily remove failing P-mode PDF test 2014-05-11 17:28:41 +03:00
hugovk
3e2ff13aa8 Fix CMYK test 2014-05-11 17:23:10 +03:00
hugovk
c15601e0b0 Add some more pdf tests 2014-05-11 17:16:13 +03:00
hugovk
f165d2034f Simple test for saving to PDF 2014-05-11 09:01:09 +03:00
Alex Clark
84a701a82b Update 2014-05-10 13:29:36 -04:00
Alex Clark ☺
e85114ae73 Merge pull request #656 from jacknagel/ft
Adjust Homebrew freetype detection logic
2014-05-10 10:28:55 -07:00
Jack Nagel
29ddeaa81a Adjust Homebrew freetype detection logic
XQuartz ships an older freetype that still has a top-level "ft2build.h"
header file. Homebrew's freetype is newer and does not have this file,
it only has "freetype2/ft2build.h".

setup.py finds the header in XQuartz first, but Homebrew's compiler
wrappers intentionally strip out the XQuartz include paths during the
build unless the package depends on it explicitly.

We want to prefer Homebrew's freetype anyway, so if it's installed,
let's not even bother to search the XQuartz paths.
2014-05-10 10:15:39 -05:00
hugovk
74514fa1f5 Some pep8 and pyflakes cleanup 2014-05-10 12:34:36 +03:00
hugovk
22a370afc2 Fix 12-year-old FIXME 2014-05-10 11:46:53 +03:00
Nicolas F
052ea606bf Clean up defines and includes for Windows
1)  Renamed USE_INLINE to PIL_USE_INLINE to avoid conflicts with
    other headers/libraries.

2)  Replace __WIN32__ and WIN32 with _WIN32

3)  Don't define WIN32 when the compiler is MSVC but not on Windows
    Why would you even...

4)  Don't define strcasecmp if you're not even going to use it.

5)  Don't include Windows.h with undefs for compilers newer than
    1998 everywhere.

6)  Don't surpress warnings for MSVC++ 4.0. People still using
    MSVC++ 4.0 deserve it.

7)  Don't include things that are already included in Windows.h
2014-05-09 21:05:30 +02:00
Nicolas F
37bb8eec24 Don't ignore USE_INLINE on Windows 2014-05-09 20:14:46 +02:00
wiredfool
958397ae02 Merge pull request #650 from hugovk/ignorecoveragewarning
Ignore PendingDeprecationWarning from Coverage for Py 3.4
2014-05-09 08:58:18 -07:00