From 99605baf663e84da5abc6d7e25b9788d24bfc0bb Mon Sep 17 00:00:00 2001
From: Johnny Chen <johnnychen94@hotmail.com>
Date: Tue, 16 Mar 2021 10:31:06 +0800
Subject: [PATCH] pass extra save_stream keywords to image2wand (#199)

Similar to the save_ method for filename, this PR passes extra keywords to image2wand. An example of this is a stream gif saving with fps keyword.

Also fixes a FileIO depwarn in the tests.
---
 src/ImageMagick.jl                   |   4 ++--
 test/constructed_images.jl           |  11 ++++++++++-
 test/images/test-exiforientation.zip | Bin 0 -> 4391 bytes
 test/readremote.jl                   |   5 ++---
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 test/images/test-exiforientation.zip

diff --git a/src/ImageMagick.jl b/src/ImageMagick.jl
index e65b70e..3a4b934 100755
--- a/src/ImageMagick.jl
+++ b/src/ImageMagick.jl
@@ -152,8 +152,8 @@ end
 
 # This differs from `save_` for files because this is primarily used
 # by IJulia, and we want to restrict large images to make display faster.
-function save_(s::Stream, img, permute_horizontal=true; mapi = clamp01nan, quality = nothing)
-    wand = image2wand(img, mapi, quality, permute_horizontal)
+function save_(s::Stream, img, permute_horizontal=true; mapi = clamp01nan, quality = nothing, kwargs...)
+    wand = image2wand(img, mapi, quality, permute_horizontal; kwargs...)
     blob = getblob(wand, formatstring(s))
     write(stream(s), blob)
 end
diff --git a/test/constructed_images.jl b/test/constructed_images.jl
index 22da7e4..082488a 100755
--- a/test/constructed_images.jl
+++ b/test/constructed_images.jl
@@ -211,7 +211,7 @@ mutable struct TestType end
         orig_img = ImageMagick.load(joinpath(workdir, "2by2.png"))
         fn = joinpath(workdir, "2by2_fromstream.png")
         open(fn, "w") do f
-            ImageMagick.save(Stream(format"PNG", f), orig_img)
+            ImageMagick.save(Stream{format"PNG"}(f), orig_img)
         end
         img = ImageMagick.load(fn)
         @test img == orig_img
@@ -266,6 +266,15 @@ mutable struct TestType end
         readimage(wand, fn)
         resetiterator(wand)
         @test ImageMagick.getimagedelay(wand) == 50
+
+        fn = joinpath(workdir, "animated.gif")
+        open(fn, "w") do io
+            ImageMagick.save(FileIO.Stream{format"GIF"}(io), A, fps=2)
+        end
+        wand = MagickWand()
+        readimage(wand, fn)
+        resetiterator(wand)
+        @test ImageMagick.getimagedelay(wand) == 50
     end
 
     @testset "ImageMeta" begin
diff --git a/test/images/test-exiforientation.zip b/test/images/test-exiforientation.zip
new file mode 100644
index 0000000000000000000000000000000000000000..b4fe46ec7f4dbc082be728714d1ee08773027316
GIT binary patch
literal 4391
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

literal 0
HcmV?d00001

diff --git a/test/readremote.jl b/test/readremote.jl
index 2105882..35512bf 100755
--- a/test/readremote.jl
+++ b/test/readremote.jl
@@ -164,9 +164,8 @@ end
 end
 
 @testset "EXIF orientation" begin
-    url = "http://magnushoff.com/assets/test-exiforientation.zip"
-    fn = joinpath(workdir, "test-exiforientation.zip")
-    download(url, fn)
+    # downloaded from http://magnushoff.com/assets/test-exiforientation.zip
+    fn = joinpath(@__DIR__, "images", "test-exiforientation.zip")
     first_img = true
     r = ZipFile.Reader(fn)
     local img0