python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-29 03:16:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2211 from radarhere/paste

Browse Source 
Changed behaviour of default box argument for paste method to match docs
This commit is contained in:
wiredfool 2016-11-14 21:58:05 +00:00 committed by GitHub
commit 318e8d9ed5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PIL/Image.py
View File

@ -1307,8 +1307,7 @@ class Image(object):
box = None box = None
if box is None: if box is None:
# cover all of self box = (0, 0)
box = (0, 0) + self.size
if len(box) == 2: if len(box) == 2:
# upper left corner given; get size from image or mask # upper left corner given; get size from image or mask
@ -1321,7 +1320,7 @@ class Image(object):
raise ValueError( raise ValueError(
"cannot determine region size; use 4-item box" "cannot determine region size; use 4-item box"
) )
box = box + (box[0]+size[0], box[1]+size[1]) box += (box[0]+size[0], box[1]+size[1])
if isStringType(im): if isStringType(im):
from PIL import ImageColor from PIL import ImageColor

7
Tests/test_image_paste.py
View File

@ -251,6 +251,13 @@ class TestImagingPaste(PillowTestCase):
(126, 63, 255, 63) (126, 63, 255, 63)
]) ])
def test_different_sizes(self):
im = Image.new('RGB', (100, 100))
im2 = Image.new('RGB', (50, 50))
im.copy().paste(im2)
im.copy().paste(im2, (0,0))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()