[librsvg: 3/9] drawing_ctx: shorten code



commit 62cf6f3b0292c4c0cc783606c37016606fc1b551
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat May 25 18:37:27 2019 +0200

    drawing_ctx: shorten code

 rsvg_internals/src/drawing_ctx.rs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 1e2d179c..f3325d0d 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -620,14 +620,12 @@ impl DrawingCtx {
         bbox: &BoundingBox,
         current_color: &cssparser::RGBA,
     ) -> Result<bool, RenderingError> {
-        let mut had_paint_server;
-
         match *ps {
             PaintServer::Iri {
                 ref iri,
                 ref alternate,
             } => {
-                had_paint_server = false;
+                let mut had_paint_server = false;
 
                 if let Some(acquired) = self.acquired_nodes.get_node(iri) {
                     let node = acquired.get();
@@ -652,19 +650,17 @@ impl DrawingCtx {
                         iri
                     );
                 }
+
+                Ok(had_paint_server)
             }
 
             PaintServer::SolidColor(color) => {
                 self.set_color(&color, opacity, current_color);
-                had_paint_server = true;
-            }
-
-            PaintServer::None => {
-                had_paint_server = false;
+                Ok(true)
             }
-        };
 
-        Ok(had_paint_server)
+            PaintServer::None => Ok(false),
+        }
     }
 
     pub fn setup_cr_for_stroke(&self, cr: &cairo::Context, values: &ComputedValues) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]