From 6256549f44f01bfa1442581d23253794e918a8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=B8egh?= Date: Sun, 5 Jun 2016 09:31:44 +0200 Subject: [PATCH] Make animation use ImageMagick.jl if it is installed. --- src/animation.jl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/animation.jl b/src/animation.jl index 843801b1..d392a15d 100644 --- a/src/animation.jl +++ b/src/animation.jl @@ -31,10 +31,17 @@ function gif(anim::Animation, fn::@compat(AbstractString) = "tmp.gif"; fps::Inte # high quality speed = round(Int, 100 / fps) - run(`convert -delay $speed -loop 0 $(anim.dir)/*.png -alpha off $fn`) + file = joinpath(Pkg.dir("ImageMagick"), "deps","deps.jl") + if isfile(file) && !haskey(ENV, "MAGICK_CONFIGURE_PATH") + include(file) + end + prefix = get(ENV, "MAGICK_CONFIGURE_PATH", "") + run(`$(joinpath(prefix, "convert")) -delay $speed -loop 0 $(joinpath(anim.dir, "*.png")) -alpha off $fn`) catch err - warn("Tried to create gif using convert (ImageMagick), but got error: $err\nWill try ffmpeg, but it's lower quality...)") + warn("""Tried to create gif using convert (ImageMagick), but got error: $err + ImageMagick can be installed by executing `Pkg.add("ImageMagick")` + Will try ffmpeg, but it's lower quality...)""") # low quality run(`ffmpeg -v 0 -framerate $fps -i $(anim.dir)/%06d.png -y $fn`)