[librsvg] Handle: remove construct_read_stream_sync()
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] Handle: remove construct_read_stream_sync()
- Date: Tue, 9 Apr 2019 16:45:35 +0000 (UTC)
commit 1811a698cdf5d51c225c860a34537a80873f8bbe
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Apr 5 18:19:01 2019 -0600
Handle: remove construct_read_stream_sync()
The only function for that is read_stream_sync() now.
librsvg_crate/src/lib.rs | 2 +-
rsvg_internals/src/c_api.rs | 4 ++--
rsvg_internals/src/handle.rs | 9 ---------
rsvg_internals/src/pixbuf_utils.rs | 2 +-
4 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/librsvg_crate/src/lib.rs b/librsvg_crate/src/lib.rs
index 950dcbc2..3d8dbd26 100644
--- a/librsvg_crate/src/lib.rs
+++ b/librsvg_crate/src/lib.rs
@@ -289,7 +289,7 @@ impl Loader {
let load_options = LoadOptions::new(self.load_flags(), base_url);
- handle.construct_read_stream_sync(&load_options, stream, cancellable.into())?;
+ handle.read_stream_sync(&load_options, stream, cancellable.into())?;
Ok(SvgHandle(handle))
}
diff --git a/rsvg_internals/src/c_api.rs b/rsvg_internals/src/c_api.rs
index 546d53d7..8c80a00d 100644
--- a/rsvg_internals/src/c_api.rs
+++ b/rsvg_internals/src/c_api.rs
@@ -963,7 +963,7 @@ pub unsafe extern "C" fn rsvg_rust_handle_new_from_gfile_sync(
.read(cancellable.as_ref())
.map_err(|e| LoadingError::from(e))
.and_then(|stream| {
- rhandle.handle.construct_read_stream_sync(
+ rhandle.handle.read_stream_sync(
&rhandle.load_options(),
&stream.upcast(),
cancellable.as_ref(),
@@ -1001,7 +1001,7 @@ pub unsafe extern "C" fn rsvg_rust_handle_new_from_stream_sync(
let stream = from_glib_none(input_stream);
let cancellable: Option<gio::Cancellable> = from_glib_none(cancellable);
- match rhandle.handle.construct_read_stream_sync(
+ match rhandle.handle.read_stream_sync(
&rhandle.load_options(),
&stream,
cancellable.as_ref(),
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 83b5e4c2..aaedb36f 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -505,15 +505,6 @@ impl Handle {
pixbuf_from_surface(&surface)
}
- pub fn construct_read_stream_sync(
- &self,
- load_options: &LoadOptions,
- stream: &gio::InputStream,
- cancellable: Option<&gio::Cancellable>,
- ) -> Result<(), LoadingError> {
- self.read_stream_sync(load_options, stream, cancellable)
- }
-
pub fn get_intrinsic_dimensions(&self) -> IntrinsicDimensions {
self.get_svg().get_intrinsic_dimensions()
}
diff --git a/rsvg_internals/src/pixbuf_utils.rs b/rsvg_internals/src/pixbuf_utils.rs
index 3b16c203..bb4a58b4 100644
--- a/rsvg_internals/src/pixbuf_utils.rs
+++ b/rsvg_internals/src/pixbuf_utils.rs
@@ -231,7 +231,7 @@ fn pixbuf_from_file_with_size_mode(
.read(cancellable)
.map_err(|e| LoadingError::from(e))
.and_then(|stream| {
- handle.construct_read_stream_sync(
+ handle.read_stream_sync(
&load_options,
&stream.upcast(),
None,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]