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

Make code for ImageMagick/GraphicsMagick more symmetric

Browse Source
This commit is contained in:
Latosha Maltba 2021-03-22 18:17:40 +00:00
parent 35943372f0
commit 52794432f0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/helper.py
View File

@ -259,11 +259,12 @@ def netpbm_available():
def magick_command(): def magick_command():
if sys.platform == "win32": if sys.platform == "win32":
imagemagick = os.environ.get("MAGICK_HOME", "") magickhome = os.environ.get("MAGICK_HOME", "")
if imagemagick: if magickhome:
imagemagick = [os.path.join(imagemagick, "convert.exe")] imagemagick = [os.path.join(magickhome, "convert.exe")]
graphicsmagick = [os.path.join(imagemagick, "gm.exe"), "convert"] graphicsmagick = [os.path.join(magickhome, "gm.exe"), "convert"]
else: else:
imagemagick = None
graphicsmagick = None graphicsmagick = None
else: else:
imagemagick = ["convert"] imagemagick = ["convert"]