From bf2e98a6cb10502a054e49af5ad0e3edbe7a5531 Mon Sep 17 00:00:00 2001 From: Pierre-Anthony Lemieux Date: Thu, 7 Dec 2023 09:23:57 -0800 Subject: [PATCH] 1.1.4 Release --- package.json | 2 +- script/refpngcompare.py | 6 +++--- src/test/resources/imsc-tests | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b54ffa82..1f8505e3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "imsc", "description": "Renders IMSC documents to HTML5 fragments", - "version": "1.1.3", + "version": "1.1.4", "license": "BSD-2-Clause", "homepage": "https://github.com/sandflow/imscJS", "bugs": "https://github.com/sandflow/imscJS/issues", diff --git a/script/refpngcompare.py b/script/refpngcompare.py index 2c846209..d0d9aaed 100644 --- a/script/refpngcompare.py +++ b/script/refpngcompare.py @@ -29,7 +29,7 @@ if fnmatch.fnmatch(file, '*.png'): try: - subprocess.check_output(["compare", '-metric', 'mse', reffile, genfile, 'null:'], stderr=subprocess.STDOUT, universal_newlines=True) + subprocess.check_output(["magick", "compare", '-metric', 'mse', reffile, genfile, 'null:'], stderr=subprocess.STDOUT, universal_newlines=True) except subprocess.CalledProcessError as err: m = re.search('([^\(]+)\(([^\)]+)', err.output) r = float(m.group(2)) @@ -41,8 +41,8 @@ if not os.path.exists(diffdir): os.makedirs(diffdir) difffile = os.path.join(args.d, os.path.relpath(dir, args.ref_dir) + "-" + file) - p1 = subprocess.Popen(["compare", reffile, genfile, "png:-"], stdout=subprocess.PIPE) - p2 = subprocess.Popen(["montage", "-mode", "concatenate", reffile, "-", genfile, difffile], stdin=p1.stdout) + p1 = subprocess.Popen(["magick", "compare", reffile, genfile, "png:-"], stdout=subprocess.PIPE) + p2 = subprocess.Popen(["magick", "montage", "-mode", "concatenate", reffile, "-", genfile, difffile], stdin=p1.stdout) p1.stdout.close() p2.communicate() diff --git a/src/test/resources/imsc-tests b/src/test/resources/imsc-tests index 9e88320c..d18f57d5 160000 --- a/src/test/resources/imsc-tests +++ b/src/test/resources/imsc-tests @@ -1 +1 @@ -Subproject commit 9e88320cb95bcd6c4b9fe219b680210af43f4439 +Subproject commit d18f57d524c4c690ad936a1074819b4836c880e9