Remove ImageMagick bug workaround (#70)

* Remove ImageMagick/FileIO load-png-from-buffer bug workaround, following [ImageMagick#180](JuliaIO/ImageMagick.jl#180)

Test with old version of FilesIO

add ImageIO

Update Project.toml

Co-authored-by: Johnny Chen <[email protected]>

* Fix deprecation warnings

* add workaround for FileIO 1.6 deprecations

suggeted by @johnnychen94

Co-authored-by: Johnny Chen <[email protected]>

Author: PhilipVinc

Project.toml

@@ -15,7 +15,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 
 [compat]
 ColorTypes = "0.7, 0.8, 0.9, 0.10"
-FileIO = "1"
+FileIO = "1.2.3"
 FixedPointNumbers = "0.6, 0.7, 0.8"
 ImageCore = "0.7, 0.8, 0.9"
 ProtoBuf = "0.10, 0.11"
@@ -24,6 +24,7 @@ StatsBase = "0.27, 0.28, 0.29, 0.30, 0.31, 0.32, 0.33"
 julia = "1.3"
 
 [extras]
+ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -38,4 +39,4 @@ ValueHistories = "98cad3c8-aec3-5f06-8e41-884608649ab7"
 WAV = "8149f6b0-98f6-5db9-b78f-408fbbb8ef88"
 
 [targets]
-test = ["Test", "MLDatasets", "TestImages", "ImageMagick", "Logging", "LightGraphs", "Plots", "PyPlot", "WAV", "Tracker", "ValueHistories", "QuartzImageIO"]
+test = ["Test", "MLDatasets", "TestImages", "ImageMagick", "Logging", "LightGraphs", "Plots", "PyPlot", "WAV", "Tracker", "ValueHistories", "QuartzImageIO", "ImageIO"]

src/Deserialization/audio.jl

@@ -2,7 +2,7 @@ function deserialize_audio_summary(summary)
     audio = summary.audio
 
     if audio.content_type == "audio/wav"
-        value = load(Stream(format"WAV", PipeBuffer(audio.encoded_audio_string)))
+        value = load(_format_stream(format"WAV", PipeBuffer(audio.encoded_audio_string)))
     else
         value = nothing
         @warn "unknown audio format $(audio.content_type)"

src/Deserialization/images.jl

@@ -1,7 +1,7 @@
 function deserialize_image_summary(summary)
     img = summary.image
 
-    value = _deserialize_png(img.encoded_image_string)
+    value = load(_format_stream(format"PNG", IOBuffer(img.encoded_image_string)))
 
     return value
 end
@@ -37,34 +37,3 @@ function lookahead_deserialize_image_summary(old_tag, old_val, evs::Summary,
 
     return result
 end
-
-
-# Ugly-ugly hack to work around
-# https://github.com/JuliaIO/FileIO.jl/issues/174
-# Essentially, ImageMagick.load() cannot handle an in-memory stream
-# but only files. Instead, ImageMagick.readblob() should be used.
-# On MacOs it's not a problem thanks to QuartzImageIO
-if !Sys.isapple()
-    did_patch_imagemagick = false
-
-    function _deserialize_png(data)
-        if !did_patch_imagemagick
-            global did_patch_imagemagick = true
-
-            # First load ImageMagick
-            FileIO.checked_import(:ImageMagick)
-        end
-        # attempt to mimick ImageMagick type reconstruction
-        attributes = PNGImage.read_info(data)
-        T = PNGImage.png_color_T(attributes)
-
-        # This errors becase we are loading ImageMagick after defining func.
-        # data = FileIO.ImageMagick.readblob(data)
-        # ERROR: MethodError: no method matching readblob(::Array{UInt8,1})
-        # The applicable method may be too new
-        _data = Base.invokelatest(FileIO.ImageMagick.readblob, data)
-        return reinterpret(T, _data)
-    end
-else
-    _deserialize_png(data) = load(Stream(format"PNG", IOBuffer(data)))
-end

src/FileIO_workaround.jl

@@ -0,0 +1,10 @@
+using FileIO: FileIO
+
+# Required for compatibility with pre 1.6 and post 1.6
+# drop in the future if the minimum requirement is bumped
+if isdefined(FileIO, :action)
+    # FileIO >= 1.6
+    _format_stream(format, io) = FileIO.Stream{format}(io)
+else
+    _format_stream(format, io) = FileIO.Stream(format, io)
+end

src/Loggers/LogAudio.jl

@@ -30,7 +30,7 @@ function audio_summary(name::AbstractString, samples::AbstractArray, samplerate:
     samples = samples./max(maximum(samples), 1)
     samples = Int16.(floor.(samples.*32767))
     io = IOBuffer()
-    save(Stream(format"WAV", io), samples)
+    save(_format_stream(format"WAV",io), samples)
     eas = io.data
     audio = Summary_Audio(sample_rate = samplerate, num_channels = ndims(samples), length_frames = size(samples, 1), encoded_audio_string = eas, content_type = "audio/wav")
     Summary_Value(tag=name, audio=audio)

src/PNG.jl

@@ -7,6 +7,9 @@ using FixedPointNumbers: Normed
 
 export PngImage, png_color_T
 
+# workaround for FileIO pre 1.6
+include("FileIO_workaround.jl")
+
 """
     PngImage
 
@@ -83,7 +86,7 @@ end
 
 function Base.convert(::Type{PngImage}, img::AbstractArray{<:Colorant})
     pb = PipeBuffer()
-    save(Stream{format"PNG"}(pb), img)
+    save(_format_stream(format"PNG", pb), img)
     return PngImage(pb)
 end
 

src/TensorBoardLogger.jl

@@ -32,6 +32,9 @@ export tb_multiline, tb_margin
 # Wrapper types
 export TBText, TBVector, TBHistogram, TBImage, TBImages, TBAudio, TBAudios
 
+# workaround for FileIO pre 1.6
+include("FileIO_workaround.jl")
+
 # Protobuffer definitions for tensorboard
 include("protojl/tensorboard/tensorboard.jl")
 using .tensorboard: Summary_Value, GraphDef, Summary, Event, SessionLog_SessionStatus, SessionLog