[librsvg] rsvg-handle.c: Move the constructors here from rsvg-base.c
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] rsvg-handle.c: Move the constructors here from rsvg-base.c
- Date: Wed, 6 Dec 2017 01:51:43 +0000 (UTC)
commit 78874a1102d891cba57264b8f5ca804f8cd55d85
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Dec 5 19:39:43 2017 -0600
rsvg-handle.c: Move the constructors here from rsvg-base.c
rsvg-base.c | 88 ---------------------------------------------------------
rsvg-handle.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+), 88 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index ad94d45..e3edd3f 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -2081,94 +2081,6 @@ rsvg_handle_read_stream_sync (RsvgHandle *handle,
}
/**
- * rsvg_handle_new_from_gfile_sync:
- * @file: a #GFile
- * @flags: flags from #RsvgHandleFlags
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @error: (allow-none): a location to store a #GError, or %NULL
- *
- * Creates a new #RsvgHandle for @file.
- *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the
- * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
- * returned.
- *
- * Returns: a new #RsvgHandle on success, or %NULL with @error filled in
- *
- * Since: 2.32
- */
-RsvgHandle *
-rsvg_handle_new_from_gfile_sync (GFile *file,
- RsvgHandleFlags flags,
- GCancellable *cancellable,
- GError **error)
-{
- RsvgHandle *handle;
- GFileInputStream *stream;
-
- g_return_val_if_fail (G_IS_FILE (file), NULL);
- g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- stream = g_file_read (file, cancellable, error);
- if (stream == NULL)
- return NULL;
-
- handle = rsvg_handle_new_from_stream_sync (G_INPUT_STREAM (stream), file,
- flags, cancellable, error);
- g_object_unref (stream);
-
- return handle;
-}
-
-/**
- * rsvg_handle_new_from_stream_sync:
- * @input_stream: a #GInputStream
- * @base_file: (allow-none): a #GFile, or %NULL
- * @flags: flags from #RsvgHandleFlags
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @error: (allow-none): a location to store a #GError, or %NULL
- *
- * Creates a new #RsvgHandle for @stream.
- *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the
- * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
- * returned.
- *
- * Returns: a new #RsvgHandle on success, or %NULL with @error filled in
- *
- * Since: 2.32
- */
-RsvgHandle *
-rsvg_handle_new_from_stream_sync (GInputStream *input_stream,
- GFile *base_file,
- RsvgHandleFlags flags,
- GCancellable *cancellable,
- GError **error)
-{
- RsvgHandle *handle;
-
- g_return_val_if_fail (G_IS_INPUT_STREAM (input_stream), NULL);
- g_return_val_if_fail (base_file == NULL || G_IS_FILE (base_file), NULL);
- g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- handle = rsvg_handle_new_with_flags (flags);
-
- if (base_file)
- rsvg_handle_set_base_gfile (handle, base_file);
-
- if (!rsvg_handle_read_stream_sync (handle, input_stream, cancellable, error)) {
- g_object_unref (handle);
- return NULL;
- }
-
- return handle;
-}
-
-/**
* _rsvg_handle_internal_set_testing:
* @handle: a #RsvgHandle
* @testing: Whether to enable testing mode
diff --git a/rsvg-handle.c b/rsvg-handle.c
index a211bf7..00a80e6 100644
--- a/rsvg-handle.c
+++ b/rsvg-handle.c
@@ -482,3 +482,91 @@ rsvg_handle_new_with_flags (RsvgHandleFlags flags)
"flags", flags,
NULL);
}
+
+/**
+ * rsvg_handle_new_from_gfile_sync:
+ * @file: a #GFile
+ * @flags: flags from #RsvgHandleFlags
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @error: (allow-none): a location to store a #GError, or %NULL
+ *
+ * Creates a new #RsvgHandle for @file.
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled by
+ * triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * Returns: a new #RsvgHandle on success, or %NULL with @error filled in
+ *
+ * Since: 2.32
+ */
+RsvgHandle *
+rsvg_handle_new_from_gfile_sync (GFile *file,
+ RsvgHandleFlags flags,
+ GCancellable *cancellable,
+ GError **error)
+{
+ RsvgHandle *handle;
+ GFileInputStream *stream;
+
+ g_return_val_if_fail (G_IS_FILE (file), NULL);
+ g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ stream = g_file_read (file, cancellable, error);
+ if (stream == NULL)
+ return NULL;
+
+ handle = rsvg_handle_new_from_stream_sync (G_INPUT_STREAM (stream), file,
+ flags, cancellable, error);
+ g_object_unref (stream);
+
+ return handle;
+}
+
+/**
+ * rsvg_handle_new_from_stream_sync:
+ * @input_stream: a #GInputStream
+ * @base_file: (allow-none): a #GFile, or %NULL
+ * @flags: flags from #RsvgHandleFlags
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @error: (allow-none): a location to store a #GError, or %NULL
+ *
+ * Creates a new #RsvgHandle for @stream.
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled by
+ * triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * Returns: a new #RsvgHandle on success, or %NULL with @error filled in
+ *
+ * Since: 2.32
+ */
+RsvgHandle *
+rsvg_handle_new_from_stream_sync (GInputStream *input_stream,
+ GFile *base_file,
+ RsvgHandleFlags flags,
+ GCancellable *cancellable,
+ GError **error)
+{
+ RsvgHandle *handle;
+
+ g_return_val_if_fail (G_IS_INPUT_STREAM (input_stream), NULL);
+ g_return_val_if_fail (base_file == NULL || G_IS_FILE (base_file), NULL);
+ g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ handle = rsvg_handle_new_with_flags (flags);
+
+ if (base_file)
+ rsvg_handle_set_base_gfile (handle, base_file);
+
+ if (!rsvg_handle_read_stream_sync (handle, input_stream, cancellable, error)) {
+ g_object_unref (handle);
+ return NULL;
+ }
+
+ return handle;
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]