Commit Graph

18738 Commits

Author SHA1 Message Date
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
wiredfool
54173d2c67 Cherry-pick of portions of patch a500ca1393, many shortcut ops added, no functional changes 2014-05-09 21:36:15 -07:00
wiredfool
471a1420b9 Merge commit '329fd00d3fe2709c043c73e075da03b6d9729a2b' into cleanup 2014-05-09 20:53:06 -07:00
wiredfool
adc17c156d Merge branch 'master' of https://github.com/dvska/Pillow into cleanup 2014-05-09 20:49:25 -07: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
hugovk
53f17f690d 'Dummy' commit to force rebuild. Extra reporting may be useful too. 2014-05-09 13:21:26 +03:00
hugovk
56fe245dd1 Don't allow 3.4 failures 2014-05-09 11:53:49 +03:00
hugovk
5f195ae1a7 On Py3.4, a PendingDeprecationWarning comes from Coverage.py for using the imp module. This warning causes 3.4 builds to fail so ignore the warning from importing coverage. 2014-05-09 11:41:43 +03:00
eliempje
91db774995 Merge pull request #3 from hugovk/patch-1
Fix tests so image2 is resized and thumbnailed
2014-05-09 01:21:34 +02:00
hugovk
11227e5dc1 Fix test because thumbnail() retains aspect ratio 2014-05-08 23:01:44 +03:00
Hugo
7a9badf18e Fix tests so image2 is resized and thumbnailed 2014-05-08 22:44:46 +03:00
eliempje
f7817b93cf Merge pull request #2 from hugovk/eps_tests
Tests for EPS thumbnail bugfix (including thumbnail bugfix)
2014-05-08 18:09:13 +02:00
hugovk
23eb9e1de8 Thumbnail tests for https://github.com/python-imaging/Pillow/pull/619 2014-05-08 11:45:02 +03:00
hugovk
134295bfd4 Resize tests for https://github.com/python-imaging/Pillow/pull/619 (plus flake8) 2014-05-08 11:43:04 +03:00
eliempje
d3192dd930 Update EpsImagePlugin.py
FIXED issue #302: https://github.com/python-imaging/Pillow/issues/302
EPS file can have binary preview. Header is now also read binary.

Also fix for resizing EPS. Resolution is now 2 dimensional and dependend on bbox and size.
2014-05-07 13:36:35 +02:00
wiredfool
a631eef872 merge from master 2014-05-06 10:23:47 -07:00
wiredfool
91d3e0cc7f typo, s/&&/%% 2014-05-06 10:21:37 -07:00
hugovk
f4071ade0a pep8 2014-05-05 22:41:09 +03:00
hugovk
e835dd70a1 Discard first byte if not 0xFF (for issue #630) 2014-05-05 22:09:57 +03:00
Nicolas F
d2fbc52d6c Change unsigned INT16 to UINT16
Addresses issue #642
2014-04-30 11:30:44 +02:00
Alex Clark ☺
73eafbb55f Merge pull request #641 from hugovk/patch-1
Python 3.4 is live on Travis CI
2014-04-30 04:42:23 -04:00
hugovk
0de2212653 Add 3.4 back 2014-04-30 11:07:43 +03:00
hugovk
d8e4ed1198 system_site_packages was causing build errors. Allow 3.4 as a failure for now, as a PendingDeprecationWarning is causing failures; this is a problem with the test runner not liking any print output. 2014-04-30 11:05:15 +03:00
Hugo
522e0ff31c Python 3.4 is live on Travis CI
http://blog.travis-ci.com/2014-04-28-upcoming-build-environment-updates/
https://twitter.com/travisci/status/461365365587456000
2014-04-30 10:06:35 +03:00
hugovk
f1cc194955 Don't compare pyaccess in __eq__ 2014-04-26 21:23:45 +03:00
hugovk
a7d21dec15 Remove temp test code 2014-04-26 20:41:01 +03:00
hugovk
7d1cdc54c4 Don't skip all the tests on Python 3 when there's no cPickle, just the irrelevant test 2014-04-26 20:20:42 +03:00
hugovk
8794c46318 For pickling, test with Image's __eq__. Everything else can use the old assert_image_equal. 2014-04-26 20:05:02 +03:00
hugovk
2a6f2c5442 Add __eq__ and __ne__ to Image to be able to test image equality when pickling. Pickle more data. 2014-04-26 19:43:53 +03:00
hugovk
6c938b784b Remove duplication by calling __init__() (Suggested by @ulope: 6802c12f89 (commitcomment-6125853)) 2014-04-26 17:18:29 +03:00
hugovk
6802c12f89 Initialise object when unpickling 2014-04-25 09:01:16 +03:00
hugovk
e4185694a2 P3 will skip explicit cPickle tests 2014-04-22 09:30:15 +03:00
hugovk
a3edb45f08 pep8 2014-04-22 09:23:34 +03:00
hugovk
adfbe8323a Tests and partial implementation of pickling (#629) 2014-04-22 08:54:16 +03:00
wiredfool
f6262505cd Merge pull request #633 from hugovk/patch-1
Run slow pypy first
2014-04-18 11:59:58 -07:00
Hugo
b917623513 Run slow pypy first
It's always the slowest and we should give it a head start so we're not waiting for it to finish at the end. It means we're making the most use of our parallel job-runners for the quicker jobs.

See also #632.
2014-04-18 15:11:05 +03:00
wiredfool
8c5ed8a873 Update CHANGES.rst [ci skip] 2014-04-17 22:22:16 -07:00
wiredfool
5ca5652d0b Merge pull request #551 from wiredfool/with
Image.close, Context manager support
2014-04-17 22:20:30 -07:00
wiredfool
471cecb523 tests for close and context manager 2014-04-17 22:01:55 -07:00
wiredfool
8c6a4c0299 Docs changes for close/context manager 2014-04-17 21:53:49 -07:00
wiredfool
b182e239bb Updated Changes.rst [ci skip] 2014-04-17 12:23:19 -07:00
wiredfool
ca36b6cd36 Merge pull request #606 from wiredfool/pgm
16 bit Read/Write PGM support.
2014-04-17 12:22:18 -07:00
wiredfool
a54754db1f Update CHANGES.rst 2014-04-17 12:20:20 -07:00
wiredfool
1945fd6cb4 Merge pull request #618 from hugovk/master
Add version 0.30 of OleFileIO (2014-02-04)
2014-04-17 12:19:03 -07:00