[librsvg: 3/3] Merge branch 'pborelli/librsvg-aurl'

[Federico Mena Quintero <federico src gnome org>]

commit b64ccdd2d730abbeb835c73c1f3d8d7d75af1f72
Merge: 755c2a6f a7fc4547
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Jan 14 17:46:34 2019 -0600

    Merge branch 'pborelli/librsvg-aurl'

 rsvg_internals/src/allowed_url.rs   | 35 ++++++++++++++++++++---------------
 rsvg_internals/src/css.rs           |  8 ++++----
 rsvg_internals/src/filters/image.rs |  4 ++--
 rsvg_internals/src/handle.rs        |  2 +-
 rsvg_internals/src/image.rs         |  2 +-
 rsvg_internals/src/io.rs            |  4 ++--
 rsvg_internals/src/xml.rs           |  8 ++++----
 7 files changed, 34 insertions(+), 29 deletions(-)
---
diff --cc rsvg_internals/src/handle.rs
index 14d12b6b,7f0305b8..47735d07
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@@ -77,13 -77,6 +77,13 @@@ impl LoadOptions 
      fn new(flags: LoadFlags, base_url: Option<Url>) -> LoadOptions {
          LoadOptions { flags, base_url }
      }
 +
 +    pub fn copy_with_base_url(&self, base_url: &AllowedUrl) -> LoadOptions {
 +        LoadOptions {
 +            flags: self.flags,
-             base_url: Some(base_url.url().clone()),
++            base_url: Some((*base_url).clone()),
 +        }
 +    }
  }
  
  #[derive(Copy, Clone, PartialEq)]