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
3,821 Commits 48 Branches 91 Tags 353 MiB
1614f2fdb5
Commit Graph

1016 Commits

Author SHA1 Message Date
wiredfool
af672b1d7e Fix for handling P + transparency -> RGBA conversions 2014-09-20 10:27:52 -07:00
wiredfool
394f6d3249 Fix for alpha preservation in ImageEnhance, #899 2014-09-18 09:10:08 -07:00
wiredfool
5dc418b8de Merge pull request #906 from hugovk/ImageGrab 
Improve error message for ImageGrab on non-Windows
 2014-09-18 09:08:07 -07:00
Jim Garrison
c85e0e915b Image.close() docstring: use correct "its" 2014-09-17 21:36:59 -07:00
Hugo
99887a5467 Improve the error message when importing ImageGrab on non-Windows (#901) 2014-09-16 16:05:22 +03:00
hugovk
8f9e338303 flake8 + typo: infile_temo -> infile_temp 2014-09-14 12:08:31 +03:00
hugovk
1de128d6b6 Merge branch 'master' into flake8 2014-09-14 10:23:51 +03:00
Hugo
126bf8f1d7 Merge pull request #898 from wiredfool/joshware-j2k-leak 
Jpeg2k Decode/Encode Memory Leak Fix
 2014-09-13 09:05:22 +03:00
Josh Ware
94194ed248 Cleaning up. 
Reduced memory limit to 1GB
 2014-09-12 22:09:27 -07:00
Josh Ware
7407371deb NULLing pointers on cleanup 2014-09-12 22:09:27 -07:00
Josh Ware
3da6768a72 Testing whether e.cleanup causes segfaults 2014-09-12 22:09:27 -07:00
Josh Ware
caa95a26b2 Added memory leak fix and testing for Encoder 2014-09-12 22:09:27 -07:00
Josh Ware
7db19efe75 Reduced JPEG2000 test iterations, and added cleanup for decoding using PyPy 2014-09-12 22:09:27 -07:00
Hugo
af8bf3f1d2 Merge pull request #886 from wiredfool/epsfile-rebase 
EpsFilePlugin Speed improvements.
 2014-09-13 08:08:24 +03:00
Andrew Murray
255a090e97 Avoid resize operation if image is already the correct size 2014-09-10 10:41:46 +10:00
wiredfool
81076d5f29 Don't copy input file for GS if not necessary, length variable name fix 2014-09-02 23:21:02 -07:00
wiredfool
ee46f45b96 Remove unused code, tighten up readline for all the line endings 2014-09-02 23:20:41 -07:00
wiredfool
8f75cc2bbf Don't search for the imagedata if we're not going to do anything with it 2014-09-02 23:20:33 -07:00
wiredfool
9b35a4538d Read the offset using original fp 
Read the rest of the text data using one of the line ending
wrappers.
 2014-09-02 23:20:23 -07:00
wiredfool
8193566ff1 Try to open the file in universal line ending mode, fallback to prev behavior 2014-09-02 23:20:05 -07:00
wiredfool
17ac15543d fp.tell resyncs the python3 with the file pointer 2014-09-02 15:20:25 -07:00
wiredfool
d8b2829f4b Partial fix for test failures, works on py2.x 2014-09-02 15:20:25 -07:00
Kenny Ostrom
d5b4f136c5 added ifd offset to the tiff decoder args, call TIFFSetSubDirectory 2014-09-02 15:20:25 -07:00
wiredfool
99f7dd2aff Allocate a new core image object for each frame, fixes problems with reusing palettes and image sizes 2014-09-02 15:20:25 -07:00
wiredfool
9f04c2d0a5 Don't close fd for multipage files 2014-09-02 15:20:24 -07:00
etienne
416d8e340e Fixed issue #857. 
When saving a JPEG and specifying 'keep' for quality or subsampling,
if the source JPEG image is in grayscale mode, don't try to find the
subsampling of the source, because grayscale images don't have any
subsampling (it's only for color components).

For the moment the fix also ignores subsampling of CMYK JPEG because
currently Pillow doesn't support encoding JPEG in YCCK mode (and
subsampling doesn't make sense in CMYK, but Pillow permits saving CMYK
JPEG with subsampling, that's a bug). This fix pass those errors
silently, i.e. it doesn't raise an error when 'keep' is used but it's
not possible to keep the subsampling (because the image is grayscale
or CMYK). I think it's the proper behavior but I'm not sure.
 2014-09-02 14:52:25 -07:00
wiredfool
86d5d8abed Merge pull request #882 from hugovk/effects 
Tests and access functions for Effects.c
 2014-09-02 14:36:24 -07:00
wiredfool
f6caaa1c9f Merge pull request #875 from hugovk/tifftags 
Correct duplicate EXIF and TIFF tags
 2014-09-02 14:32:47 -07:00
hugovk
bcc5305125 Add access functions for ImagingEffectSpread with a test 2014-09-02 15:53:58 +03:00
hugovk
8c96d38ce9 Add access functions for ImagingEffectMandelbrot with a test 2014-09-02 15:14:00 +03:00
hugovk
860e67e1c4 Add access functions for ImagingEffectNoise with a test 2014-09-02 14:11:08 +03:00
hugovk
42610c0ecd flake8 2014-08-28 17:18:54 +03:00
hugovk
1335006cd7 flake8 2014-08-28 14:44:19 +03:00
hugovk
c2f0903627 Correct the correction: RelatedImageWidth=0x1001, RelatedImageLength=0x1002 2014-08-27 11:06:34 +03:00
hugovk
d866a29bd8 Correct duplicate EXIF tags: http://www.exiv2.org/tags.html 2014-08-27 10:46:34 +03:00
hugovk
8de95676e0 flake8 2014-08-26 16:47:10 +03:00
hugovk
ec2a225fff flake8 2014-08-26 15:52:37 +03:00
hugovk
952d1d5bf5 Remove duplicate tag caused by typo in spec: http://www.asmail.be/msg0055321032.html 2014-08-26 15:51:37 +03:00
hugovk
998955b024 Fix for Python 3 2014-08-26 12:23:12 +03:00
hugovk
08499d3547 flake8 2014-08-26 12:16:32 +03:00
hugovk
6b5871a484 Fix for GIMP 1.3 gradient files 2014-08-26 12:14:58 +03:00
Hugo
9f7a382b02 Merge pull request #856 from megabuz/tgainfo 
Fix TGA files with image ID field
 2014-08-20 09:57:04 +03:00
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
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
wiredfool
90bbd9ff3e Delayed import error for doc use 2014-04-02 20:09:04 -07:00
wiredfool
7b4768a9fa Bump all the version numbers 2014-04-02 15:25:46 -07:00
wiredfool
0d7115a5a4 Merge from master 2014-03-30 09:14:04 -07:00
Alex Clark ☺
6e6bc21ba1 Merge pull request #565 from al45tair/icns-support 
Improved icns support
 2014-03-30 07:30:14 -04:00
Alex Clark ☺
0baa82ac69 Merge pull request #580 from wiredfool/libtiff-fd-leak 
Fixes libtiff leaking open files
 2014-03-29 18:25:57 -04:00
Alastair Houghton
172e46def8 Fixed a silly mistake. 2014-03-28 09:30:16 +00:00
Alastair Houghton
5dd67abd71 Merge branch 'master' into icns-support 2014-03-28 09:15:20 +00:00
Alastair Houghton
5aac5b7eff Made JPEG2K support for files conditional on its inclusion in pillow build. Added a JPEG2K icon test. 2014-03-28 09:09:55 +00:00
wiredfool
937ae7790f Renamed variables from reused single letter confusing names to something halfway descriptive 2014-03-27 22:19:39 -07:00
wiredfool
9552d9bc66 close the fd, if possible. Fixes #526 2014-03-27 22:18:40 -07:00
wiredfool
3e24bc684d Merge pull request #578 from wiredfool/xrange 
Python3 issues in JpegImagePlugin
 2014-03-27 20:52:07 -07:00
wiredfool
a2800ba9a1 Additional commits from pr 2014-03-27 20:00:10 -07:00
wiredfool
e07b0d8ac9 don't use xrange, has_key, fixes #577 2014-03-27 16:40:44 -07:00
Alastair Houghton
0eccdf534d Merge branch 'master' into icns+jp2k 2014-03-27 08:38:02 +00:00
Alastair Houghton
18d6432036 Fixed some problems with the reduce option, as well as a number of warnings from GCC. 2014-03-27 08:35:38 +00:00
wiredfool
2b81156619 merge to master 2014-03-26 18:46:35 -07:00
Alastair Houghton
cbe7e93bdd Merge branch 'icns-support' into icns+jp2k 2014-03-26 11:18:26 +00:00
Alastair Houghton
3655a0ecce Fixed a pre-existing Python 3 bug. 2014-03-26 11:12:14 +00:00
Alastair Houghton
5904ac1718 Added some tests and a couple of icns files. 2014-03-26 10:49:39 +00:00
wiredfool
8adbaf8098 Better tests, fixes for leaking RGB->P transparency 2014-03-26 00:01:10 -07:00
wiredfool
8ea903ec59 Transparency conversion for L, RGP and P images, fixes #510 2014-03-25 23:34:41 -07:00
wiredfool
abebac25cc Sane quantize defaults for RGBA->P, fixes #544 2014-03-25 21:42:40 -07:00
Alastair Houghton
18f12b30aa The JPEG plug-in will seek the stream if it's an fd, so change to using an io.BytesIO. 2014-03-24 18:04:37 +00:00
Alastair Houghton
5f77c39090 Added JPEG 2000 support for .icns files. 2014-03-24 17:24:49 +00:00
Alastair Houghton
8eec69d39e Merging JPEG 2000 support with .icns plugin. 2014-03-24 17:22:59 +00:00
Alastair Houghton
9b5bc2012f Removed print statements. 2014-03-24 17:13:14 +00:00
Lars Buitinck
61975dd8ad more detailed error messages from Image.py 2014-03-24 17:49:19 +01:00
Alastair Houghton
299c278e66 Improved icns support 2014-03-24 16:10:23 +00:00
Alastair Houghton
ac8ebccfa6 Added tests and fixed a few bugs that the tests threw up. 2014-03-19 12:16:14 +00:00
wiredfool
45ce1e04a7 Docstring/comment fixes [skip ci] ref #534 2014-03-17 13:29:44 -07:00
wiredfool
196a48b4fd added context manager support 2014-03-17 13:17:34 -07:00
Alex Clark ☺
878d0ca51d Merge pull request #512 from vadmium/pl 
Merge from Philippe Lagadec’s OleFileIO_PL fork
 2014-03-17 10:41:26 -04:00
Alex Clark ☺
da3ab720f4 Merge pull request #534 from homm/fix-getcolor-rgba 
Fix ImageColor.getcolor
 2014-03-17 10:20:40 -04:00
Alex Clark ☺
054eb71bc6 Merge pull request #525 from wiredfool/ico_parser 
Make ICO files work with the ImageFile.Parser interface, fixes #522
 2014-03-17 10:14:03 -04:00
Alex Clark
0e9f4c6c60 Merge branch 'dschmidt_palette_513' of https://github.com/wiredfool/Pillow into wiredfool-dschmidt_palette_513 2014-03-17 09:48:24 -04:00
Alex Clark
c1d44980b8 Merge branch 'pcx' of https://github.com/wiredfool/Pillow into wiredfool-pcx 2014-03-17 09:38:38 -04:00
wiredfool
1e331e3e6a Removed tempfile.mktemp, fixes CVE-2014-1932 CVE-2014-1933, debian bug #737059 2014-03-14 15:56:41 -07:00
Alastair Houghton
6840278b7d Removed print statement. 2014-03-14 16:49:29 +00:00
Alastair Houghton
9a1b6966b5 Added precinct size option. Also added the jp2klib_version symbol on the _imaging module. 2014-03-14 15:40:30 +00:00
Alastair Houghton
cb1f990a92 Added seek support to make writing jp2 files work. Also added support for directly using an fd rather than relying on the Python loop, if we have a real fd. 2014-03-14 11:21:08 +00:00
Alastair Houghton
61fb89ec54 Added a JPEG 2000 encoder. 2014-03-13 18:27:16 +00:00
Alastair Houghton
5b22b715ce Fixed some bugs. 2014-03-13 12:29:03 +00:00
Alastair Houghton
7dba77364a Fixed rounding. 2014-03-13 11:57:47 +00:00
Alastair Houghton
d6b8f0f666 Added a JPEG 2000 decoder based on OpenJPEG. 2014-03-13 11:46:47 +00:00
wiredfool
414e887726 Merge Changes from Master 2014-03-04 22:43:19 -08:00
wiredfool
f8ce951a2d Merge Changes from master 2014-03-04 22:41:36 -08:00
wiredfool
a77ee2d8c5 Fix test failure when optimizing the palette on mode L gifs 2014-03-04 21:44:32 -08:00
David Schmidt
6457eed2cb overwrite redundant Image palette with new ImageCore Palette after quantize, fixes #513 2014-03-04 21:44:32 -08:00
David Schmidt
232c175bd9 fixes #513 2014-03-04 21:44:32 -08:00
David Schmidt
93a8bc9bd3 * fix palette handling for converted gifs 
* fix gif optimization
* better auto convert paramter for gif save
 2014-03-04 21:44:32 -08:00
wiredfool
89cb3c7e85 Use even stride when saving odd sized .pcx files 2014-03-03 23:05:50 -08:00
wiredfool
fe5372c867 Debug Loging 2014-03-03 20:29:14 -08:00
homm
68a64e8071 fix ImageColor.getcolor in cases: 
- color is rgba, mode is RGB
- mode is LA
 2014-03-03 16:10:34 +04:00
wiredfool
aa864f4ab4 Merge pull request #533 from wiredfool/fix_528 
Fix for  transparency = 0 in PNG mode P images
 2014-02-28 16:34:32 -08:00
David Schmidt
37f4aea0d0 fixes #529 
doc fix
 2014-02-25 09:56:49 +01:00
David Schmidt
f848993c89 fixes #528 
Accept 0 as transparency value.
 2014-02-25 09:50:42 +01:00
wiredfool
36323d1140 Make ICO files work with the ImageFile.Parser interface, fixes #522 2014-02-16 20:58:06 -08:00
Alex Clark ☺
cbdd639838 Merge pull request #504 from e98cuenc/highquality 
Improve heuristic used when saving progressive and optimized JPEGs with high quality values.
 2014-02-10 07:23:44 -05:00
Martin Panter
99e7599ce2 OleFileIO: Add MAGIC constant to __all__ 
This is used by other modules in Pillow.
 2014-02-04 04:10:19 +00:00
wiredfool
c9955628e2 Merge from master 2014-01-31 21:38:34 -08:00
wiredfool
88d0e6080a Fixed DOS with invalid BMP size entries 2014-01-31 21:33:24 -08:00
wiredfool
de1b02dc8c Merge pull request #508 from wiredfool/no-icc-profile 
Fix crash on saving PNG when icc_profile is None
 2014-01-31 14:03:21 -08:00
wiredfool
8a86364885 Merge branch 'no-icc-profile' of github.com:wiredfool/Pillow into no-icc-profile 2014-01-31 13:59:38 -08:00
wiredfool
3ea93e5de5 Merge branch 'bmp_test' of github.com:wiredfool/Pillow into bmp_test 2014-01-31 13:52:17 -08:00
wiredfool
288a563d1a merge from master 2014-01-31 13:45:31 -08:00
Alex Clark ☺
5750d5d6ef Merge pull request #474 from sciunto/bool 
Maint: minor patch on booleans + travis
 2014-01-31 13:16:38 -08:00
Martin Panter
caa609c438 Do away with @functools.total_ordering to restore Python 2.6 support 
* Manually implement __ne__() and __lt__()
* __gt__() and __ge__() not needed due to operator reflection
 2014-01-31 01:32:46 +00:00
Martin Panter
704ed76229 Update documentation for Python 3 2014-01-30 23:47:12 +00:00
Martin Panter
a6fd013a77 Implement rich comparison using @total_ordering (2.7+, 3.2+) 2014-01-30 23:38:04 +00:00
Martin Panter
5143df8561 Use range() rather than xrange(), for Python 3 compatibility 2014-01-30 23:38:04 +00:00
Martin Panter
6977b592e3 Port more stuff to Python 3, dropping some pre-2.6 support 2014-01-30 23:38:04 +00:00
Martin Panter
cd61720845 Merge Pillow changes with Philippe Lagadec’s OleFileIO_PL fork 
Conflicts:
	PIL/OleFileIO.py

I kept Philippe’s version of Unicode decoding that uses UTF-16LE. Pillow
started using Python’s “utf_16” codec in the meantime, but I understand it
uses native byte ordering by default.
 2014-01-30 23:37:44 +00:00
Martin Panter
ac5cb028be Convert OleFileIO.py to LF newlines before merging 2014-01-30 23:30:58 +00:00
decalage
0b79c83709 updated readme 2014-01-30 23:29:57 +00:00
decalage
a468016b63 v0.26: added methods to parse stream/storage timestamps, improved listdir to include storages, fixed parsing of direntry timestamps 2014-01-30 23:29:57 +00:00
decalage
e1fe77b48b fix #12 
updated readme
 2014-01-30 23:29:57 +00:00
decalage
7d37cf071f - getproperties: improved exception handling 
- _raise_defect: added option to set exception type
- all non-fatal issues are now recorded, and displayed when run as a script
 2014-01-30 23:29:57 +00:00
decalage
8e826441b2 2013-05-24 v0.25 PL: - getproperties: option to not convert some timestamps 
- OleMetaData: total_edit_time is now a number of seconds,
                       not a timestamp
                     - getproperties: added support for VT_BOOL, VT_INT, V_UINT
                     - getproperties: filter out null chars from strings
                     - getproperties: raise non-fatal defects instead of
                       exceptions when properties cannot be parsed properly
 2014-01-30 23:29:57 +00:00
decalage
90f0b6796e updated readme 2014-01-30 23:29:57 +00:00
decalage
5b616ca1be v0.24: slight improvements in OleMetadata, updated readme. 2014-01-30 23:29:57 +00:00
decalage
c5cd0ccefc updated readme 2014-01-30 23:29:57 +00:00
decalage
d5166fd97e - new class OleMetadata to parse standard properties 
- added get_metadata method to OleFileIO
 2014-01-30 23:29:57 +00:00
decalage
25158fe8b1 - getproperties: added conversion from filetime to python datetime 
- main: displays properties with date format
 2014-01-30 23:29:54 +00:00
decalage
4bdd2b2bef version 0.23 - updated readme and setup.py 2014-01-30 23:29:40 +00:00
decalage
f88809e5f3 Updated readme in markdown and rst formats 2014-01-30 23:29:08 +00:00
decalage
ab541b1b4d Added comments for patch submitted by mete0r_kr, changed version 2014-01-30 23:21:25 +00:00
mete0r sarangbang
bbee2b5b8a support file-like object 
fix #8
 2014-01-30 23:21:25 +00:00
decalage
eaeb12f695 Fixed issue 2 - added close method to OleFileIO class 2014-01-30 23:21:25 +00:00
decalage
bd833a6972 Fixed issue 7 in OleFileIO.getproperties reported by chuckleberryfinn 2014-01-30 23:21:23 +00:00
decalage
491f3e9f99 updated readme 2014-01-30 23:20:31 +00:00
decalage
87a7ec955e version 0.21 2010-01-22 2014-01-30 23:20:28 +00:00