[lasem] introspection: some fix for better python bindings
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [lasem] introspection: some fix for better python bindings
- Date: Thu, 15 Feb 2018 10:31:07 +0000 (UTC)
commit b794412192df384eecbc68919ffeee03350f780e
Author: Emmanuel Pacaud <emmanuel gnome org>
Date: Thu Feb 15 11:29:49 2018 +0100
introspection: some fix for better python bindings
https://bugzilla.gnome.org/show_bug.cgi?id=793482
src/lasemrender.c | 4 ++--
src/lsmdomparser.c | 14 +++++++-------
src/lsmdomparser.h | 6 +++---
src/lsmdomview.c | 12 ++++++------
4 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/lasemrender.c b/src/lasemrender.c
index 8d769d8..63f0596 100644
--- a/src/lasemrender.c
+++ b/src/lasemrender.c
@@ -269,13 +269,13 @@ main(int argc, char **argv)
if (document != NULL) {
if (lsm_debug_check (&lsm_debug_category_dom, LSM_DEBUG_LEVEL_LOG)) {
- void *buffer;
+ char *buffer;
gsize size;
lsm_dom_document_save_to_memory (document, &buffer, &size, NULL);
if (buffer != NULL) {
- printf ("%*s\n", (int) size, (char *) buffer);
+ printf ("%*s\n", (int) size, buffer);
g_free (buffer);
}
}
diff --git a/src/lsmdomparser.c b/src/lsmdomparser.c
index 5d0fe9d..b2e9e12 100644
--- a/src/lsmdomparser.c
+++ b/src/lsmdomparser.c
@@ -259,7 +259,7 @@ typedef enum {
static LsmDomDocument *
_parse_memory (LsmDomDocument *document, LsmDomNode *node,
- const void *buffer, gssize size, GError **error)
+ const char *buffer, gssize size, GError **error)
{
static LsmDomSaxParserState state;
@@ -304,7 +304,7 @@ _parse_memory (LsmDomDocument *document, LsmDomNode *node,
void
lsm_dom_document_append_from_memory (LsmDomDocument *document, LsmDomNode *node,
- const void *buffer, gssize size, GError **error)
+ const char *buffer, gssize size, GError **error)
{
g_return_if_fail (LSM_IS_DOM_DOCUMENT (document));
g_return_if_fail (LSM_IS_DOM_NODE (node) || node == NULL);
@@ -323,11 +323,11 @@ lsm_dom_document_append_from_memory (LsmDomDocument *document, LsmDomNode *node,
*/
LsmDomDocument *
-lsm_dom_document_new_from_memory (const void *buffer, gssize size, GError **error)
+lsm_dom_document_new_from_memory (const char *buffer, gssize size, GError **error)
{
g_return_val_if_fail (buffer != NULL, NULL);
- return _parse_memory (NULL, NULL, buffer, size, error);
+ return _parse_memory (NULL, NULL, buffer, size, error);
}
/**
@@ -432,15 +432,15 @@ lsm_dom_document_save_to_stream (LsmDomDocument *document, GOutputStream *stream
/**
* lsm_dom_document_save_to_memory:
* @document: a #LsmDomDocument
- * @buffer: placeholder for a pointer to the resulting data buffer
- * @size: placeholder for the data size
+ * @buffer: (out callee-allocates): placeholder for a pointer to the resulting data buffer
+ * @size: (out) (optional): placeholder for the data size
* @error: placeholder for a #GError
*
* Save @document as an xml representation into @buffer.
*/
void
-lsm_dom_document_save_to_memory (LsmDomDocument *document, void **buffer, gsize *size, GError **error)
+lsm_dom_document_save_to_memory (LsmDomDocument *document, char **buffer, gsize *size, GError **error)
{
GOutputStream *stream;
diff --git a/src/lsmdomparser.h b/src/lsmdomparser.h
index 28cfb34..bd1c9ed 100644
--- a/src/lsmdomparser.h
+++ b/src/lsmdomparser.h
@@ -30,8 +30,8 @@
G_BEGIN_DECLS
void lsm_dom_document_append_from_memory (LsmDomDocument *document, LsmDomNode *node,
- const void *buffer, gssize size, GError
**error);
-LsmDomDocument * lsm_dom_document_new_from_memory (const void *buffer, gssize size, GError
**error);
+ const char *buffer, gssize size, GError
**error);
+LsmDomDocument * lsm_dom_document_new_from_memory (const char *buffer, gssize size, GError
**error);
LsmDomDocument * lsm_dom_document_new_from_path (const char *path, GError **error);
LsmDomDocument * lsm_dom_document_new_from_url (const char *url, GError **error);
@@ -39,7 +39,7 @@ void lsm_dom_document_save_to_stream (LsmDomDocument *document,
GOutputStream *stream,
GError **error);
void lsm_dom_document_save_to_memory (LsmDomDocument *document,
- void **buffer,
+ char **buffer,
gsize *size,
GError **error);
void lsm_dom_document_save_to_path (LsmDomDocument *document,
diff --git a/src/lsmdomview.c b/src/lsmdomview.c
index ed0d03f..566cdef 100644
--- a/src/lsmdomview.c
+++ b/src/lsmdomview.c
@@ -145,9 +145,9 @@ lsm_dom_view_get_viewport_pixels (LsmDomView *self)
/**
* lsm_dom_view_get_size:
* @view: a #LsmDomView
- * @width: view width placeholder, in points
- * @height: view height placeholder, in points
- * @baseline: view baseline, in points
+ * @width: (out) (optional): view width placeholder, in points
+ * @height: (out) (optional): view height placeholder, in points
+ * @baseline: (out) (optional): view baseline, in points
*
* Get the view size and baseline. Baseline is for use of view inside bloc of text.
*/
@@ -175,9 +175,9 @@ lsm_dom_view_get_size (LsmDomView *view, double *width, double *height, double *
/**
* lsm_dom_view_get_size_pixels:
* @view: a #LsmDomView
- * @width: view width placeholder, in pixels
- * @height: view height placeholder, in pixels
- * @baseline: view baseline, in pixels
+ * @width: (out) (optional): view width placeholder, in pixels
+ * @height: (out) (optional): view height placeholder, in pixels
+ * @baseline: (out) (optional): view baseline, in pixels
*
* Get the view size and baseline. Baseline is for use of view inside bloc of text.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]