python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 01:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,952 Commits 48 Branches 91 Tags 353 MiB
7e167a1233
Commit Graph

774 Commits

Author SHA1 Message Date
Alexey Buzanov
f94b6b4025 flake8 and tests 2014-08-20 10:32:06 +04:00
wiredfool
2d634d3019 Bump Version/Changelog 2014-08-19 08:52:29 -07:00
wiredfool
347a1d8d95 J2k DOS fix -- CVE-2014-3598 
Found and reported by Andrew Drake of dropbox.com
 2014-08-19 08:25:40 -07:00
Hugo
3aa9326574 Merge pull request #843 from uvNikita/gif_mode_fix 
Fixed wrong mode of gif image.
 2014-08-19 17:50:49 +03:00
Alexey Buzanov
1bd4919a35 Fix tga files with image ID field 2014-08-19 17:53:51 +04:00
wiredfool
205e056f8f Icns DOS fix -- CVE-2014-3589 
Found and reported by Andrew Drake of dropbox.com
 2014-08-13 09:25:11 -07:00
Nikita Uvarov
97e111d079 Fixed wrong mode of gif image. 
In case of L mode and small image.
 2014-08-07 16:23:08 +03:00
Hugo
3fa247fd7c Merge pull request #837 from wiredfool/cms-profile 
Return Profile with Transformed Images
 2014-08-03 09:22:03 +03:00
wiredfool
6538d971e2 Docs for profile additions 2014-08-02 21:22:51 -07:00
Mat Moore
e5bceac912 Changed docstring to refer to the correct function 2014-08-02 12:17:57 +01:00
wiredfool
ed3016a08a Merge pull request #832 from hugovk/IptcImagePlugin 
Tests for IptcImagePlugin.py
 2014-08-01 10:12:01 -07:00
hugovk
a0aff1a87f Remove disabled _is_raw() 2014-08-01 11:12:47 +03:00
hugovk
f5440cc3e1 Fixes for Python 3 2014-07-30 20:43:34 +03:00
hugovk
515bb6e14d flake8 2014-07-30 19:39:11 +03:00
Eric W. Brown
3f0ff0177e Dropped unused "options" from MPO save. 2014-07-30 09:17:43 -07:00
Eric W. Brown
b46f5c6b1e Better documented limited MPO save feature. 
At present it’s only possible to save the current frame of an MPO, not
the MPO in its entirety. Added testing verifying as much.
 2014-07-30 09:17:36 -07:00
wiredfool
5966278643 Added im.info['icc_profile'] to results for ImageCms.applyTransform 2014-07-29 21:20:11 -07:00
wiredfool
13eb3d667a Added profile.tobytes() for ImageCms Profiles 2014-07-29 20:44:17 -07:00
wiredfool
ab1bbb07c3 Merge pull request #827 from hugovk/test_file_tiff 
More tests for TiffImagePlugin
 2014-07-29 15:11:36 -07:00
hugovk
56404f6888 Change wrapping to include some context on first line; plus typo fix 2014-07-29 23:00:38 +03:00
hugovk
70528dd539 flake8 2014-07-28 19:00:06 +03:00
Eric W. Brown
c97d1a5601 Updates to MPO handler based on review. 
Took out the explicit reference to the MPO Plug-in in Image as it’s now
indirectly referenced via the JPEG Plug-in. Removed the direct MPO
Plug-in registration as it’s now shared with the JPEG Plug-in.
Commented on assertion.
 2014-07-28 11:14:38 -04:00
Eric W. Brown
310bf90222 Merge branch 'master' of https://github.com/python-pillow/Pillow 2014-07-28 11:00:49 -04:00
Hugo
328fd35dad Merge pull request #818 from dolda2000/itxt 
Added support for encoding and decoding iTXt chunks.
 2014-07-26 10:30:00 +03:00
Eric W. Brown
14976346a8 Fixed import for Python 3. 
Fixed the trivial import bug that prevented the Python 3 version of MPO
from running. On the way fixed the trivial C bug that prevented
Convert.c from compiling properly in a Mac OS X environment for a
Python 3 target.
 2014-07-25 11:50:21 -04:00
Eric W. Brown
8101c2a313 Merge branch 'master' of https://github.com/python-pillow/Pillow 2014-07-25 10:08:18 -04:00
Eric W. Brown
a5683ab574 Implemented MP attribute breakdown with tests. 2014-07-24 15:00:19 -04:00
Eric W. Brown
dcd171c1b8 Minor refactoring per discussion and MPO docs. 2014-07-24 11:16:12 -04:00
Hugo
352f1fd41f Merge pull request #816 from wiredfool/hsv 
HSV Support
 2014-07-24 09:20:04 +03:00
Eric W. Brown
832e11bed5 Enabled seeking in MPO files. 
Note to self: either put the offset in the load_seek() definition or
the tile definition, not both.
 2014-07-23 11:27:46 -04:00
Fredrik Tolf
a9f4e30641 Save detected non-Latin1 characters as iTXt to preserve them. 2014-07-23 07:43:52 -07:00
Eric W. Brown
6605bf22e5 Merge branch 'master' of https://github.com/python-pillow/Pillow 2014-07-23 09:22:15 -04:00
Fredrik Tolf
c469dd9ae5 Added support for encoding and decoding iTXt chunks. 2014-07-23 00:28:44 -07:00
wiredfool
625ff24358 Storage, packing and access for HSV format images 2014-07-22 16:09:22 -07:00
Eric W. Brown
1d3fe7ff45 Corrected offset for MPO frames. 2014-07-22 18:23:45 -04:00
Eric W. Brown
d5909e4946 Basic MPO reading works, seek is partially there. 2014-07-22 13:31:51 -04:00
hugovk
d06735b49e More ImagePalette.py tests and remove unused and uncallable new() 2014-07-21 23:18:46 +03:00
wiredfool
7155919b5b Merge pull request #809 from hugovk/public_gamma_lut 
Make _make_gamma_lut() public
 2014-07-20 11:37:41 -07:00
hugovk
751f672058 Call public, non-warning versions internally 2014-07-20 21:08:14 +03:00
hugovk
37691bc1e4 Make _make_linear_lut public and issue deprecation warnings from old private methods 2014-07-20 10:13:26 +03:00
wiredfool
bf2014ece6 Merge pull request #803 from hugovk/SgiImagePlugin 
Sanity tests for SgiImagePlugin.py
 2014-07-19 21:21:11 -07:00
hugovk
fef3ceb2c0 If we can't read a file due to unsupported compression, raise an error 2014-07-20 01:50:05 +03:00
Eric W. Brown
098e4c36d6 Further populated Exif values in TiffTags. 
Added lots more of the possible Exif values per the EXIF specifications.
 2014-07-18 22:02:14 -04:00
hugovk
3c39a44f6e Make _make_gamma_lut() public 2014-07-19 01:45:57 +03:00
Hugo
eb4f669b34 Merge pull request #808 from wiredfool/xpm_load_image 
Fix Scrambled XPM
 2014-07-19 00:28:02 +03:00
wiredfool
d30eb007ef Fix scrambled XPM image, don't mmap when load_read/load_seek is defined. Fixes #806 2014-07-18 10:40:08 -07:00
Eric W. Brown
5857053be4 Activated MPO detection. 
Added MPO to the list to be checked. Removed the superfluous second os
import. Added OS X & Komodo work files to .gitignore.
 2014-07-17 12:30:45 -04:00
hugovk
8db043b35f flake8 2014-07-17 02:40:14 +03:00
hugovk
3c8f858aad flake8 2014-07-17 01:21:56 +03:00
hugovk
9acbaa4aee Flake8 and fix typo 2014-07-17 00:12:54 +03:00
hugovk
3322bfbad0 flake8 2014-07-16 21:30:41 +03:00
Eric W. Brown
53b7f6294b First steps toward MPO support. 
Allows Pillow to distinguish between JPEGs and MPOs, and provides some
MPO metadata handling. Does not yet handle multiple frames.
 2014-07-16 11:36:56 -04:00
hugovk
43dab9113e flake8 2014-07-16 14:26:30 +03:00
wiredfool
09b0d1cfa6 converted to current docutils format 2014-07-15 21:24:52 -07:00
wiredfool
b6c33596b3 Broke out OleFileIO into its own page, Added docs from the readme 2014-07-15 16:56:59 -07:00
hugovk
17223001df flake8 2014-07-15 18:38:10 +03:00
Alex Clark
4b40839970 Revert "Bump" 
This reverts commit 4fe5d520fb.

Hah, foiled by PEP8
 2014-07-15 06:15:31 -04:00
Alex Clark
4fe5d520fb Bump 
Though I hate the 'dev' designation I want something to indicate master is where development for the next major version happens. I think we've previously disagreed on simply 'X.X.X' so I'm going with 'X.X.Xdev' to see if that is more palatable. :-)
 2014-07-15 06:02:34 -04:00
wiredfool
5eef39f3fb Asserting copyright over lcms2 port 2014-07-14 22:00:29 -07:00
wiredfool
6a928ff6e2 Removed leading docstring 2014-07-14 21:59:42 -07:00
wiredfool
5e12c49034 Fixing doc warning 2014-07-14 21:32:14 -07:00
wiredfool
a0d6cf01ce Fixing doc warnings, reformatting docstring comments 2014-07-14 21:24:54 -07:00
wiredfool
a0cfa466d9 Fixing warnings when building docs 2014-07-14 21:11:00 -07:00
wiredfool
b6b36543ce Autodoc formatting 2014-07-12 09:52:04 -07:00
wiredfool
7bea6764e9 Merge pull request #773 from hugovk/ImageMath 
More tests for ImageMath.py
 2014-07-10 10:14:20 -07:00
wiredfool
552effb90d Merge #772 and master 2014-07-08 10:29:53 -07:00
wiredfool
65357e1722 Merge pull request #783 from hugovk/_util 
Tests for _util.py
 2014-07-08 09:16:52 -07:00
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