python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-27 02:16:19 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,582 Commits 48 Branches 91 Tags 365 MiB
99887a5467
Commit Graph

704 Commits

Author SHA1 Message Date
Alex Clark ☺
962f1b46af Merge pull request #784 from tk0miya/master 
Fix return value of FreeTypeFont.textsize() does not include font offsets
 2014-07-08 05:14:01 -04:00
hugovk
c2cf0b4edd Merge remote-tracking branch 'upstream/master' into _util 2014-07-07 23:48:19 +03:00
Hugo
cb5ed5973a Merge pull request #765 from larsjsol/master 
Fix dispose calculations for animated GIFs
 2014-07-07 23:04:38 +03:00
hugovk
add45b494a Extract __main__ section of PIL/ImageFont.py into Scripts/createfontdatachunk.py 2014-07-07 22:31:20 +03:00
Lars Jørgen Solberg
925277cbfc ensure that the prevous frame was loaded when seek()ing 2014-07-07 20:46:54 +02:00
wiredfool
e23d3ab779 Merge pull request #780 from hugovk/kill_save2 
Remove unused WIP save2() from pre-fork days
 2014-07-07 11:28:40 -07:00
Hugo
737c7440d7 Merge pull request #775 from radarhere/master 
Added class checking to Image __eq__ function
 2014-07-07 19:23:06 +03:00
Takeshi KOMIYA
60628c77b3 Fix return value of FreeTypeFont.textsize() does not include font offsets 2014-07-07 14:42:46 +09:00
hugovk
302978e464 flake8 2014-07-06 01:50:24 +03:00
hugovk
01c0cc9417 Remove unused WIP save2() from pre-fork days 2014-07-05 23:02:34 +03:00
wiredfool
a414986ee9 Merge from master 2014-07-05 11:02:13 -07:00
Andrew Murray
1aee9bfdef Added class checking to __eq__ function 2014-07-05 23:16:14 +10:00
hugovk
5f2138d915 flake8 ImageMath.py 2014-07-05 12:13:43 +03:00
hugovk
770ef9312b flake8 and fix path in __main__ 2014-07-05 01:02:46 +03:00
Lars Jørgen Solberg
047832c6c6 only update the disposal_method if it not 'unspecified' 2014-07-03 19:01:18 +02:00
Lars Jørgen Solberg
f88a355c6c Handle transparency between frames for animated GIFs 
Show the previous frame for transparent pixels when the disposal method is 'do not dispose'.

This fixes issue 634.
 2014-07-03 18:53:21 +02:00
Lars Jørgen Solberg
08a9bdbcd6 Fix dispose calculations 
- use correct dispose mode
- only apply the dispose on extent of the previous frame
 2014-07-02 21:27:52 +02:00
wiredfool
a035ecc2ca Merge branch 'master' into HEAD 2014-07-02 08:59:16 -07:00
hugovk
775307113b Ensure rowbytes is an integer (fix for Python 3) 2014-07-01 22:36:56 +03:00
wiredfool
cec5fd9d38 f doesn't exist, BytesIO objects have fileno(), but may return OsError 2014-07-01 11:09:20 -07:00
Alex Clark
f8b6163d9f Bump 2.4.0 -> 2.5.0 2014-07-01 07:42:50 -04:00
hugovk
1afa2f2aa9 some flake8 2014-07-01 10:44:36 +03:00
Michael Brown
c0fb5ace23 Fix load_djpeg and _save_cjpeg in windows 2014-06-30 19:52:07 -04:00
Hugo
d8f55e3f50 Merge pull request #748 from wiredfool/djpeg 
Prevent shell injection
 2014-06-30 02:16:06 +03:00
wiredfool
b981ef425b Suppress stderr from ppmquant and ppmtogif 2014-06-29 14:24:32 -07:00
wiredfool
5fdc14facb Removing previous approach 2014-06-29 13:46:17 -07:00
wiredfool
118a2d5ff0 Merge pull request #745 from gcq/master 
Handle resolution in BMP files
 2014-06-29 13:32:02 -07:00
gcq
61be1d8b19 dpi key should only be present when there is resolution info in the BMP header. 2014-06-28 23:59:01 +02:00
gcq
9318755a18 Adds dpi to the Image info dictinoary. 2014-06-28 23:21:22 +02:00
gcq
103354facc BMP now uses a reasonable resolution, and customizable using the "dpi" option. 2014-06-28 22:18:47 +02:00
Michael Brown
a301d061fb Better error checking in _save_netpbm 2014-06-27 19:07:20 -04:00
Michael Brown
34317edd8a Change most uses of os.system to use subprocess 
The only places left that use os.system are in ImageShow and setup.py
 2014-06-27 19:07:20 -04:00
Michael Brown
cd7b45994b Prevent shell injection in load_djpeg 2014-06-27 19:07:20 -04:00
hugovk
c261674980 Remove obsolete Animated Raster Graphics support 2014-06-27 15:58:12 +03:00
wiredfool
d79d28152b Merge pull request #728 from hugovk/test_cleanup 
Old tests cleanup
 2014-06-26 22:58:35 -07:00
David Joy
b147dea535 Add tests and fix a 16bit vs 32bit integer bug 
Yay unit tests!
 2014-06-25 14:06:56 -04:00
David Joy
479693417f Merge the rest of the patches 
Now it actually works and passes the test suite
 2014-06-25 11:42:06 -04:00
David Joy
433ec1c219 Clean commit of 16-bit monochrome JPEK2000 support 2014-06-25 11:13:33 -04:00
hugovk
f41e0a30fb More tests cleanup 2014-06-25 12:10:20 +03:00
cgohlke
a5ae40c1b4 Fix AttributeError: class Image has no attribute 'DEBUG' 2014-06-24 22:53:23 -07:00
Alex Clark ☺
7d232a3c32 Merge pull request #719 from wiredfool/imagepalette 
Tests for Imagepalette.save()
 2014-06-24 13:41:32 -04:00
Alex Clark ☺
ca148208f0 Merge pull request #716 from hugovk/morph_flake8 
Flake8 on morphology changes
 2014-06-24 05:51:04 -04:00
Alex Clark ☺
88bfd5522d Merge pull request #714 from wiredfool/jpeg_qtables 
JPEG qtables
 2014-06-24 05:48:17 -04:00
Hugo
0cd52412b1 Merge pull request #654 from wiredfool/cleanup 
Thanks.
 2014-06-24 12:16:13 +03:00
brightpisces
8755bda4e3 Update ImagePalette.py 
According to __init__, using `len(self.mode)` might be better. Tested on my machine.
 2014-06-24 16:27:35 +08:00
brightpisces
e9821edd94 Match real palette format in ImagePalette.save() 2014-06-24 15:34:43 +08:00
hugovk
540477b066 Update a docstring [CI skip] 2014-06-24 09:51:42 +03:00
hugovk
fd97d30831 flake8 on morphology changes 2014-06-24 09:34:05 +03:00
wiredfool
6dce921dad Merge branch 'master' into morphology 2014-06-23 16:21:33 -07:00
wiredfool
eda4864b62 send a bytes object into the c layer instead of a bytearray, which is unimplemented in pypy 2014-06-23 16:02:29 -07:00
Alex Clark ☺
2a657f7873 Merge pull request #674 from hugovk/bomb 
Decompression bomb protection
 2014-06-23 12:27:01 -04:00
hugovk
1633ffa878 Merge branch 'cleanup' of https://github.com/wiredfool/Pillow into wiredfool-cleanup 
Conflicts:
	Tests/test_file_jpeg2k.py
	Tests/test_image_transform.py
	Tests/test_imagesequence.py
 2014-06-23 13:39:27 +03:00
hugovk
46abe78b77 Use a custom subclass of RuntimeWarning for DecompressionBombWarning 2014-06-23 10:53:08 +03:00
hugovk
195453679a Merge branch 'master' into bomb 
Conflicts:
	PIL/Image.py
 2014-06-23 09:51:46 +03:00
hugovk
78003ca473 Update paths to Tests/images/ instead of Images/ 2014-06-23 09:19:29 +03:00
Alex Clark
175d68aeeb Update URL; fix typo 2014-06-22 16:44:52 -04:00
Alex Clark
9ed5b08cb9 Update URL 
http://www.graficaobscura.com/interp/index.html
 2014-06-22 16:30:41 -04:00
wiredfool
9935c40d6c Merge branch 'master' into jpeg_qtables 2014-06-20 00:35:06 -07:00
wiredfool
7dc4dcc9fd Merge from master 2014-06-20 00:34:32 -07:00
wiredfool
b95eb3d3d1 Pass bytearray into C layer instead of castin g to string in the Python layer. 2014-06-19 14:54:39 -07:00
wiredfool
a422a4ff4e ensure files are closed 2014-06-19 13:21:40 -07:00
wiredfool
85693d60d0 initial py3 compatibility 2014-06-19 13:21:14 -07:00
Alex Clark
6a79d80374 Revert "Merge pull request #5 from hugovk/unittest1merge" 
This reverts commit 0940f0b043, reversing
changes made to 07aa1a56bb.

Conflicts:
	.travis.yml
	test/helper.py
	test/test_imagedraw.py
 2014-06-10 07:45:42 -04:00
Alex Clark
b2a2f16b23 Revert "Merge pull request #693 from hugovk/unittest0" 
This reverts commit 001b46c670, reversing
changes made to 8beb66443b.
 2014-06-10 07:43:23 -04:00
hugovk
bc91358101 Merge remote-tracking branch 'upstream/master' into unittest1merge 
Conflicts:
	Tests/test_imagedraw.py
 2014-06-07 22:56:19 +03:00
Ben Williams
9415407b83 Fix a its/it's incorrect usage 2014-06-06 21:42:20 +01:00
hugovk
45fd3b8bf5 Merge remote-tracking branch 'upstream/master' into unittest0 
Conflicts:
	.travis.yml
 2014-06-05 12:29:35 +03:00
Alex Clark ☺
841582fa26 Merge pull request #685 from hugovk/docstring 
ImageCms fixes
 2014-06-04 18:31:40 -04:00
Dov Grobgeld
5fe80c6d4a Initial commit of binary morphology addon. 2014-06-04 23:03:00 +03:00
wiredfool
618a79c1c6 Merge from master, pre-unittest conversion 2014-06-03 14:42:22 -07:00
wiredfool
da1523d877 Merge from master, pre-unittest conversion 2014-06-03 14:29:16 -07:00
François Boulogne
682ad75759 DOC: fix name in docstring 2014-06-03 16:34:23 -04:00
hugovk
cd967680cb Move dummy test to test/ and run with nosetests 2014-06-03 18:04:27 +03:00
Alex Clark
dc667b1f19 Fix link 2014-06-03 09:01:57 -04:00
hugovk
c9a4272af6 Replace python-imaging with python-pillow (but yet not Coveralls) 2014-06-03 13:02:44 +03:00
hugovk
4c2b3a6afc Merge remote-tracking branch 'upstream/master' into docstring 
Conflicts:
	PIL/ImageCms.py
 2014-06-02 11:04:29 +03:00
hugovk
27d49b6f27 pep8 2014-06-02 09:57:49 +03:00
wiredfool
60e2eaa5e9 Merge pull request #680 from hugovk/spider 
Add tests for SPIDER image files
 2014-05-30 08:46:33 -07:00
Chris Sinchok
70a50907c2 This patch allows a JPEG image to be saved with a specific qtables 
value (in dictionary format).

Previously, this would throw a TypeError when checking if the qtables
value was actually a preset. By adding an isStringType check, we can
avoid this error.
 2014-05-28 17:21:58 -05:00
Alastair Houghton
87d10dcaeb Oops. Fixed a silly mistake. 2014-05-27 15:05:25 +01:00
Alastair Houghton
1011e51083 Added support for OpenJPEG 2.1. 2014-05-27 12:43:54 +01:00
hugovk
d7ed249b29 Remove redundant commented code [CI skip] 2014-05-27 14:39:33 +03:00
hugovk
fd05e9c756 Test decompression bomb warnings 2014-05-27 12:40:52 +03:00
hugovk
b853696ad5 Remove stray debug print 2014-05-27 12:18:56 +03:00
hugovk
a0d8e5cb33 Set limit to to around a quarter gigabyte for a 24 bit (3 bpp) image 2014-05-27 12:10:10 +03:00
hugovk
eacbd7b04a pep8/pyflakes 2014-05-26 21:56:40 +03:00
hugovk
5217a523d6 Make sure nvalues is int and not float for Python 3 2014-05-26 21:18:48 +03:00
hugovk
5f9cad1a8e pyflakes 2014-05-26 20:15:48 +03:00
hugovk
29388f8395 Remove redundant comment [CI skip] 2014-05-26 16:26:42 +03:00
hugovk
35f1f4d8fa Change exception into a warning 2014-05-26 16:25:15 +03:00
hugovk
b7e5c27696 Remove temporary print 2014-05-24 17:52:48 +03:00
wiredfool
26b0f20763 Merge pull request #669 from wiredfool/tiff_compression 
Use libtiff for writing any compressed tiff files
 2014-05-24 13:16:57 +01:00
wiredfool
a91387e9dd Merge pull request #673 from wiredfool/pickling 
Support for pickling Image objects
 2014-05-24 13:14:42 +01:00
wiredfool
3f18e0adfe Merge pull request #619 from eliempje/master 
Bugfix: EPS thumbnail failed
 2014-05-24 13:09:25 +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
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
wiredfool
3b227d1a05 Merge from current master 2014-05-20 11:47:53 -07:00
wiredfool
edd75ceb91 Use libtiff for writing any compressed tiff files, Fixes #659, #431 2014-05-20 10:15:01 -07: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
8d4a77a939 merge from master 2014-05-20 08:58:09 -07: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
ca7608f1d5 Possible fix for #664 2014-05-17 20:36:17 +03:00
hugovk
ce2955ec71 Throw an exception when an opened image is larger than an arbitrary limit 2014-05-14 18:04:18 +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
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
adc17c156d Merge branch 'master' of https://github.com/dvska/Pillow into cleanup 2014-05-09 20:49:25 -07: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
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
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
hugovk
f1cc194955 Don't compare pyaccess in __eq__ 2014-04-26 21:23:45 +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
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
5ca5652d0b Merge pull request #551 from wiredfool/with 
Image.close, Context manager support
 2014-04-17 22:20:30 -07:00
wiredfool
8c6a4c0299 Docs changes for close/context manager 2014-04-17 21:53:49 -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
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
Dmitry Selitsky
d5b09509be logic typo fix 2014-04-16 16:07:43 +03:00
hugovk
a97e5039d8 Remove unused _binary import (plus flake8) 2014-04-14 12:51:12 +03:00
hugovk
5cd454bde2 Fix docstring printing from __main__, and pyflakes and some pep8 2014-04-14 12:30:32 +03:00
eliempje
2cd6d416b2 Bugfix: EPS thumbnail failed 
EPS thumbnail failed to resize correctly due to incorrect resolution argument (should be a function of the image size and bounding box). This is fixed in this commit.
 2014-04-12 13:38:39 +02:00
Hugo
be201bf4f3 Undo cleanup reversal 
"Just pointing out that this bit is actually reversing a recent cleanup in Pillow. See commit 923018d and PR #474. I guess that cleanup was merged into Pillow after I did my merge from Pillow to PL’s fork."
https://github.com/python-imaging/Pillow/pull/618#discussion_r11559186
 2014-04-12 12:43:24 +03:00
hugovk
43ec928d33 version 0.30 2014-02-04 2014-04-11 14:03:32 +03:00
Hijackal
029a4a5079 Add specific 32-bit float tiff format 
We regularly use this format to store 32bit floats and I would like to see it handled by clean Pillow installations without having to add it on every system I use.
 2014-04-10 15:52:53 +02:00
wiredfool
3d352329f4 Use the deferred error to provide a logical exception on access to a closed image 2014-04-08 23:43:13 -07:00
wiredfool
b27ef76468 Rename import_err to something more general 2014-04-08 23:42:34 -07:00
wiredfool
1256fb496e Merge from master 2014-04-08 23:22:40 -07:00
wiredfool
398450a5e4 Fix failing tests, turns out I is different than L 2014-04-08 22:44:24 -07:00
wiredfool
88e235f3f5 sanity check on ascii integers 2014-04-08 22:43:57 -07:00
wiredfool
213cec00cb consistency 2014-04-07 22:24:48 -07:00
wiredfool
327ea209b8 Write support, fixes #602 2014-04-07 22:23:04 -07:00
wiredfool
f5ba642b5e Read support for 16 bit pgm file 2014-04-07 22:12:33 -07:00
wiredfool
86d5c5c389 Have the tempfile use a suffix with a dot 2014-04-07 16:01:49 -07:00
wiredfool
844ed441de Add the suffix if it's not there, not if it is 2014-04-07 15:59:33 -07:00
Michal Čihař
07650be832 Fix variable name 
Wrong variable name was used for transparency manipulations.
 2014-04-07 17:36:36 +02:00
wiredfool
82d7524add made has_ghostscript a method, using it from test_imagefile 2014-04-04 13:33:54 -07:00
wiredfool
8ca2cfe75c Use an import error instead of a plain exception 2014-04-03 16:05:02 -07:00
wiredfool
688c8dd538 comment ->autodoc transform 2014-04-03 15:47:57 -07:00