python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-27 07:34:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 3482f23f62 into 8a4a1e0338

Browse Source
This commit is contained in:
Hugo 2017-10-04 12:53:29 +00:00 committed by GitHub
commit 666e77b746
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PIL/ImageDraw.py
View File

@ -217,7 +217,8 @@ class ImageDraw(object):
ink = fill
if ink is not None:
try:
mask, offset = font.getmask2(text, self.fontmode, *args, **kwargs)
mask, offset = font.getmask2(text, self.fontmode,
*args, **kwargs)
xy = xy[0] + offset[0], xy[1] + offset[1]
except AttributeError:
try:
@ -254,6 +255,8 @@ class ImageDraw(object):
def textsize(self, text, font=None, spacing=4, direction=None,
features=None):
"""Get the size of a given string, in pixels."""
if len(text) == 0:
return (0, 0)
if self._multiline_check(text):
return self.multiline_textsize(text, font, spacing,
direction, features)