diff options
author | 2020-03-31 17:11:58 +0200 | |
---|---|---|
committer | 2020-03-31 17:11:58 +0200 | |
commit | 990b4aa0b75d069c08e5f4018f9430a70a394eb7 (patch) | |
tree | 3100782d2dfb19dea456402d6615ec340e97d9b7 /wgpu/src/image | |
parent | 749a9588d738de9c3ae734e6f026768c77eb3cce (diff) | |
parent | 291dc728a42c6e888ca6d97eea0f3308591b15a5 (diff) | |
download | iced-990b4aa0b75d069c08e5f4018f9430a70a394eb7.tar.gz iced-990b4aa0b75d069c08e5f4018f9430a70a394eb7.tar.bz2 iced-990b4aa0b75d069c08e5f4018f9430a70a394eb7.zip |
Merge branch 'master' into feature/container-padding
Diffstat (limited to 'wgpu/src/image')
-rw-r--r-- | wgpu/src/image/vector.rs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs index bae0f82f..b6776827 100644 --- a/wgpu/src/image/vector.rs +++ b/wgpu/src/image/vector.rs @@ -45,9 +45,19 @@ impl Cache { let opt = resvg::Options::default(); - let svg = match resvg::usvg::Tree::from_file(handle.path(), &opt.usvg) { - Ok(tree) => Svg::Loaded(tree), - Err(_) => Svg::NotFound, + let svg = match handle.data() { + svg::Data::Path(path) => { + match resvg::usvg::Tree::from_file(path, &opt.usvg) { + Ok(tree) => Svg::Loaded(tree), + Err(_) => Svg::NotFound, + } + } + svg::Data::Bytes(bytes) => { + match resvg::usvg::Tree::from_data(&bytes, &opt.usvg) { + Ok(tree) => Svg::Loaded(tree), + Err(_) => Svg::NotFound, + } + } }; let _ = self.svgs.insert(handle.id(), svg); |