diff options
author | Federico Mena Quintero <federico@gnome.org> | 2023-02-13 15:42:07 -0600 |
---|---|---|
committer | Federico Mena Quintero <federico@gnome.org> | 2023-02-13 15:42:07 -0600 |
commit | 1e64b535c185bbb27ed9c767f4fa573a8f8899de (patch) | |
tree | b2b1f94fc8ada4003a5a74a2fd07be0235b337cb | |
parent | dabceef9096f2fadaf377e0e9e73cf05f8d40cb4 (diff) | |
download | librsvg-1e64b535c185bbb27ed9c767f4fa573a8f8899de.tar.gz |
Fix deprecations from nalgebra
Dynamic::new(value) -> Dyn(value)
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/795>
-rw-r--r-- | src/filters/convolve_matrix.rs | 8 | ||||
-rw-r--r-- | src/filters/gaussian_blur.rs | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/filters/convolve_matrix.rs b/src/filters/convolve_matrix.rs index a445e733..4a78c671 100644 --- a/src/filters/convolve_matrix.rs +++ b/src/filters/convolve_matrix.rs @@ -1,6 +1,6 @@ use cssparser::Parser; use markup5ever::{expanded_name, local_name, namespace_url, ns}; -use nalgebra::{DMatrix, Dynamic, VecStorage}; +use nalgebra::{DMatrix, Dyn, VecStorage}; use crate::document::AcquiredNodes; use crate::drawing_ctx::DrawingCtx; @@ -209,11 +209,7 @@ impl ConvolveMatrix { }); } - let matrix = DMatrix::from_data(VecStorage::new( - Dynamic::new(rows), - Dynamic::new(cols), - numbers, - )); + let matrix = DMatrix::from_data(VecStorage::new(Dyn(rows), Dyn(cols), numbers)); let divisor = if self.divisor != 0.0 { self.divisor diff --git a/src/filters/gaussian_blur.rs b/src/filters/gaussian_blur.rs index e6ae3b68..33644354 100644 --- a/src/filters/gaussian_blur.rs +++ b/src/filters/gaussian_blur.rs @@ -2,7 +2,7 @@ use std::cmp::min; use std::f64; use markup5ever::{expanded_name, local_name, namespace_url, ns}; -use nalgebra::{DMatrix, Dynamic, VecStorage}; +use nalgebra::{DMatrix, Dyn, VecStorage}; use crate::document::AcquiredNodes; use crate::drawing_ctx::DrawingCtx; @@ -183,11 +183,7 @@ fn gaussian_blur( } else { (1, kernel.len()) }; - let kernel = DMatrix::from_data(VecStorage::new( - Dynamic::new(rows), - Dynamic::new(cols), - kernel, - )); + let kernel = DMatrix::from_data(VecStorage::new(Dyn(rows), Dyn(cols), kernel)); Ok(input_surface.convolve( bounds, |