python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-03 21:24:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Partial Fix #370: look for osx fonts in common places

Browse Source
This commit is contained in:
Charles Law 2014-12-26 15:12:21 -08:00 committed by Charles Law
parent 707b43f14d
commit 4d2dd3ee7b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PIL/ImageFont.py
View File

@ -239,6 +239,10 @@ def truetype(font=None, size=10, index=0, encoding="", filename=None):
try: try:
return FreeTypeFont(font, size, index, encoding) return FreeTypeFont(font, size, index, encoding)
except IOError: except IOError:
if font.endswith(".ttf"):
ttf_filename = font
else:
ttf_filename = "%s.ttf" % font
if sys.platform == "win32": if sys.platform == "win32":
# check the windows font repository # check the windows font repository
# NOTE: must use uppercase WINDIR, to work around bugs in # NOTE: must use uppercase WINDIR, to work around bugs in
@ -247,6 +251,12 @@ def truetype(font=None, size=10, index=0, encoding="", filename=None):
if windir: if windir:
filename = os.path.join(windir, "fonts", font) filename = os.path.join(windir, "fonts", font)
return FreeTypeFont(filename, size, index, encoding) return FreeTypeFont(filename, size, index, encoding)
elif sys.platform == 'darwin':
macdirs = ['/Library/Fonts/', '/System/Library/Fonts/', os.path.expanduser('~/Library/Fonts/')]
for macdir in macdirs:
filepath = os.path.join(macdir, ttf_filename)
if os.path.exists(filepath):
return FreeTypeFont(filepath, size, index, encoding)
raise raise