[librsvg: 1/2] Fix API for building a Loader




commit 86aea1de0aff06336438d8b480ff50f149955a40
Author: Sven Neumann <sven svenfoo org>
Date:   Wed Nov 4 13:46:33 2020 +0100

    Fix API for building a Loader

 src/api.rs          | 12 ++++++------
 src/c_api/handle.rs | 14 +++-----------
 2 files changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/src/api.rs b/src/api.rs
index 75b927d9..5c8f95f4 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -215,12 +215,12 @@ impl Loader {
     /// use librsvg;
     ///
     /// let svg_handle = librsvg::Loader::new()
-    ///     .with_unlimited_size()
+    ///     .with_unlimited_size(true)
     ///     .read_path("example.svg")    // presumably a trusted huge file
     ///     .unwrap();
     /// ```
-    pub fn with_unlimited_size(mut self) -> Self {
-        self.unlimited_size = true;
+    pub fn with_unlimited_size(mut self, unlimited: bool) -> Self {
+        self.unlimited_size = unlimited;
         self
     }
 
@@ -241,7 +241,7 @@ impl Loader {
     /// ```
     /// # use std::env;
     /// let svg_handle = librsvg::Loader::new()
-    ///     .keep_image_data()
+    ///     .keep_image_data(true)
     ///     .read_path("example.svg")
     ///     .unwrap();
     ///
@@ -257,8 +257,8 @@ impl Loader {
     /// )?;
     /// # Ok::<(), librsvg::RenderingError>(())
     /// ```
-    pub fn keep_image_data(mut self) -> Self {
-        self.keep_image_data = true;
+    pub fn keep_image_data(mut self, keep: bool) -> Self {
+        self.keep_image_data = keep;
         self
     }
 
diff --git a/src/c_api/handle.rs b/src/c_api/handle.rs
index 116b9da0..808bdcaa 100644
--- a/src/c_api/handle.rs
+++ b/src/c_api/handle.rs
@@ -851,17 +851,9 @@ impl CHandle {
     fn make_loader(&self) -> Loader {
         let inner = self.inner.borrow();
 
-        let mut loader = Loader::new();
-
-        if inner.load_flags.unlimited_size {
-            loader = loader.with_unlimited_size();
-        }
-
-        if inner.load_flags.keep_image_data {
-            loader = loader.keep_image_data();
-        }
-
-        loader
+        Loader::new()
+            .with_unlimited_size(inner.load_flags.unlimited_size)
+            .keep_image_data(inner.load_flags.keep_image_data)
     }
 
     fn has_sub(&self, id: &str) -> Result<bool, RenderingError> {


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