diff --git a/Project.toml b/Project.toml index ca0eb93a..46aacdfd 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Plots" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" author = ["Tom Breloff (@tbreloff)"] -version = "0.29.1" +version = "0.29.3" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -32,7 +32,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] Contour = "0.5" -FFMPEG = "0.2" +FFMPEG = "0.2, 0.3" FixedPointNumbers = "0.6, 0.7, 0.8" GR = "0.46, 0.47" GeometryTypes = "0.7" diff --git a/README.md b/README.md index ed68838c..3c57fef1 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ [docs-img]: https://img.shields.io/badge/docs-stable-blue.svg [docs-url]: http://docs.juliaplots.org/latest/ -[![][travis-img]](travis-url) -[![][appveyor-img]](appveyor-url) +[![][travis-img]][travis-url] +[![][appveyor-img]][appveyor-url] [![][pkgeval-img]][pkgeval-url] [![][gitter-img]][gitter-url] [![][docs-img]][docs-url] diff --git a/src/backends/hdf5.jl b/src/backends/hdf5.jl index 9b357216..07995e17 100644 --- a/src/backends/hdf5.jl +++ b/src/backends/hdf5.jl @@ -109,7 +109,7 @@ _hdf5_datapath(subpath::String) = "$_hdf5_dataroot/$subpath" _hdf5_map_str2telem(k::String) = HDF5PLOT_MAP_STR2TELEM[k] _hdf5_map_str2telem(v::Vector) = HDF5PLOT_MAP_STR2TELEM[v[1]] -function _hdf5_merge!(dest::Dict, src::Dict) +function _hdf5_merge!(dest, src) for (k, v) in src if isa(v, Axis) _hdf5_merge!(dest[k].plotattributes, v.plotattributes) @@ -295,7 +295,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Tuple) end #NOTE: _hdf5plot_overwritetype overwrites "Array" type with "Tuple". end -function _hdf5plot_gwrite(grp, k::String, plotattributes::Dict) +function _hdf5plot_gwrite(grp, k::String, plotattributes::AKW) # @warn("Cannot write dict: $k=$plotattributes") end function _hdf5plot_gwrite(grp, k::String, v::AbstractRange) @@ -376,7 +376,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Subplot) _hdf5plot_writetype(grp, Subplot) return end -function _hdf5plot_write(grp, plotattributes::Dict) +function _hdf5plot_write(grp, plotattributes::AKW) for (k, v) in plotattributes kstr = string(k) _hdf5plot_gwrite(grp, kstr, v) @@ -567,7 +567,7 @@ function _hdf5plot_read(grp, k::String) end #Read in values in group to populate plotattributes: -function _hdf5plot_read(grp, plotattributes::Dict) +function _hdf5plot_read(grp, plotattributes::AKW) gnames = names(grp) for k in gnames try