Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use magick instead of convert if available #299

Merged
merged 1 commit into from
Nov 13, 2024
Merged

use magick instead of convert if available #299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion test/html/driver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ if [ ! -e $DILLOBIN ]; then
exit 1
fi

magick_bin="convert"
if command -v magick 2>&1 >/dev/null; then
magick_bin="magick"
fi

function render_page() {
htmlfile="$1"
outpic="$2"
Expand All @@ -35,7 +40,7 @@ function render_page() {
echo "cannot find Dillo window" >&2
exit 1
fi
xwd -id "$winid" -silent | convert xwd:- png:${outpic}
xwd -id "$winid" -silent | ${magick_bin} xwd:- png:${outpic}

kill "$dillopid"
}
Expand Down
Loading