josch/img2pdf
3
6
Fork 10
Code Issues 22 Pull requests 5 Projects Releases 3 Wiki Activity

tighten minimum imagemagick version for quantum:polarity=min-is-black

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-08-04 09:30:03 +02:00
parent 593aeb5d2d
commit fbb51d9083
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/img2pdf_test.py
View file

@ -52,12 +52,12 @@ HAVE_IMAGEMAGICK_MODERN = True
try: try:
ver = subprocess.check_output(["convert", "-version"], stderr=subprocess.STDOUT) ver = subprocess.check_output(["convert", "-version"], stderr=subprocess.STDOUT)
m = re.fullmatch( m = re.fullmatch(
r"Version: ImageMagick ([0-9.]+)-.*", ver.split(b"\n")[0].decode("utf8") r"Version: ImageMagick ([0-9.]+-[0-9]+) .*", ver.split(b"\n")[0].decode("utf8")
) )
if m is None: if m is None:
HAVE_IMAGEMAGICK_MODERN = False HAVE_IMAGEMAGICK_MODERN = False
else: else:
if parse_version(m.group(1)) < parse_version("6.9.10"): if parse_version(m.group(1)) < parse_version("6.9.10-12"):
HAVE_IMAGEMAGICK_MODERN = False HAVE_IMAGEMAGICK_MODERN = False
except FileNotFoundError: except FileNotFoundError:
HAVE_IMAGEMAGICK_MODERN = False HAVE_IMAGEMAGICK_MODERN = False
@ -65,7 +65,7 @@ except subprocess.CalledProcessError:
HAVE_IMAGEMAGICK_MODERN = False HAVE_IMAGEMAGICK_MODERN = False
if not HAVE_IMAGEMAGICK_MODERN: if not HAVE_IMAGEMAGICK_MODERN:
warnings.warn("imagemagick >= 6.9.10 not available, skipping certain checks...") warnings.warn("imagemagick >= 6.9.10-12 not available, skipping certain checks...")
############################################################################### ###############################################################################
# HELPER FUNCTIONS # # HELPER FUNCTIONS #
@ -2219,6 +2219,7 @@ def tiff_ccitt_lsb_m2l_black_img(tmp_path_factory, tmp_gray1_png):
# "-define quantum:polarity=min-is-black" requires ImageMagick with: # "-define quantum:polarity=min-is-black" requires ImageMagick with:
# https://github.com/ImageMagick/ImageMagick/commit/00730551f0a34328685c59d0dde87dd9e366103a # https://github.com/ImageMagick/ImageMagick/commit/00730551f0a34328685c59d0dde87dd9e366103a
# or at least 7.0.8-11 from Aug 29, 2018 # or at least 7.0.8-11 from Aug 29, 2018
# or at least 6.9.10-12 from Sep 7, 2018 (for the ImageMagick6 branch)
# also see: https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=34605 # also see: https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=34605
subprocess.check_call( subprocess.check_call(
[ [