[librsvg: 4/5] Primitive.resolve does not need to return a Result anymore
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 4/5] Primitive.resolve does not need to return a Result anymore
- Date: Fri, 9 Apr 2021 23:24:50 +0000 (UTC)
commit 949311723e5ceb9efb67153c22d954b2cd46f8da
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Apr 9 18:08:06 2021 -0500
Primitive.resolve does not need to return a Result anymore
src/filters/mod.rs | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/filters/mod.rs b/src/filters/mod.rs
index 44614969..1dcf73c5 100644
--- a/src/filters/mod.rs
+++ b/src/filters/mod.rs
@@ -137,7 +137,7 @@ impl Primitive {
ctx: &FilterContext,
values: &ComputedValues,
draw_ctx: &DrawingCtx,
- ) -> Result<ResolvedPrimitive, FilterError> {
+ ) -> ResolvedPrimitive {
let params = draw_ctx.push_coord_units(ctx.primitive_units());
let x = self.x.map(|l| l.normalize(values, ¶ms));
@@ -145,13 +145,13 @@ impl Primitive {
let width = self.width.map(|l| l.normalize(values, ¶ms));
let height = self.height.map(|l| l.normalize(values, ¶ms));
- Ok(ResolvedPrimitive {
+ ResolvedPrimitive {
x,
y,
width,
height,
result: self.result.clone(),
- })
+ }
}
}
@@ -269,10 +269,8 @@ pub fn render(
.resolve(&primitive_node)
.and_then(|(primitive, params)| {
let resolved_primitive =
- primitive.resolve(&filter_ctx, primitive_values, draw_ctx)?;
- Ok((resolved_primitive, params))
- })
- .and_then(|(resolved_primitive, params)| {
+ primitive.resolve(&filter_ctx, primitive_values, draw_ctx);
+
let output = render_primitive(
&resolved_primitive,
¶ms,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]