[librsvg: 2/4] Length: Ensure that the length value is finite in a single place
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/4] Length: Ensure that the length value is finite in a single place
- Date: Tue, 8 Dec 2020 21:39:58 +0000 (UTC)
commit 26b570b8f74d56d1bfe90d7c28f1f7dd42f630d8
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Dec 8 09:37:53 2020 -0600
Length: Ensure that the length value is finite in a single place
src/length.rs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/length.rs b/src/length.rs
index bc091425..c2fe9a19 100644
--- a/src/length.rs
+++ b/src/length.rs
@@ -238,20 +238,19 @@ impl<N: Normalize> Parse for Length<N> {
match token {
Token::Number { value, .. } => {
- l_value = f64::from(finite_f32(value).map_err(|e| parser.new_custom_error(e))?);
+ l_value = value;
l_unit = LengthUnit::Px;
}
Token::Percentage { unit_value, .. } => {
- l_value =
- f64::from(finite_f32(unit_value).map_err(|e| parser.new_custom_error(e))?);
+ l_value = unit_value;
l_unit = LengthUnit::Percent;
}
Token::Dimension {
value, ref unit, ..
} => {
- l_value = f64::from(finite_f32(value).map_err(|e| parser.new_custom_error(e))?);
+ l_value = value;
l_unit = match unit.as_ref() {
"px" => LengthUnit::Px,
@@ -270,6 +269,8 @@ impl<N: Normalize> Parse for Length<N> {
_ => return Err(parser.new_unexpected_token_error(token.clone())),
}
+ let l_value = f64::from(finite_f32(l_value).map_err(|e| parser.new_custom_error(e))?);
+
Ok(Length::new(l_value, l_unit))
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]