[libgda] report-engine: replaced deprecated API
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] report-engine: replaced deprecated API
- Date: Wed, 12 Sep 2018 11:54:57 +0000 (UTC)
commit 1c17c00fb7f855e0e5f66cef6a301d7e2e5a04cc
Author: Daniel Espinosa <esodan gmail com>
Date: Sun Sep 2 13:42:14 2018 -0500
report-engine: replaced deprecated API
libgda-report/engine/rt-parser.c | 56 ++++++++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 20 deletions(-)
---
diff --git a/libgda-report/engine/rt-parser.c b/libgda-report/engine/rt-parser.c
index 404795710..972f32e30 100644
--- a/libgda-report/engine/rt-parser.c
+++ b/libgda-report/engine/rt-parser.c
@@ -1173,13 +1173,17 @@ rich_text_node_to_docbook (RenderingContext *context, xmlNodePtr top_parent, RtN
g_free (tmp);
#ifdef HAVE_GDKPIXBUF
- GdkPixdata pixdata;
- if (gda_binary_get_data (rtnode->binary) &&
- gdk_pixdata_deserialize (&pixdata, gda_binary_get_size (rtnode->binary),
- (guint8*) gda_binary_get_data (rtnode->binary), NULL)) {
- GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_from_pixdata (&pixdata, TRUE, NULL);
- if (pixbuf) {
+ GInputStream *istream;
+ gpointer data;
+ GError *error = NULL;
+ data = gda_binary_get_data (rtnode->binary);
+ if (data != NULL) {
+ istream = g_memory_input_stream_new_from_data (data,
+ gda_binary_get_size
(rtnode->binary),
+ NULL);
+ GdkPixbuf *pixbuf = NULL;
+ pixbuf = gdk_pixbuf_new_from_stream (istream, NULL, &error );
+ if (pixbuf) {
/* write to file */
if (gdk_pixbuf_save (pixbuf, file, "jpeg", NULL,
"quality", "100", NULL)) {
@@ -1187,10 +1191,14 @@ rich_text_node_to_docbook (RenderingContext *context, xmlNodePtr top_parent, RtN
saved = TRUE;
type = 0;
}
-
g_object_unref (pixbuf);
- }
- }
+ } else {
+ g_message ("Error reading binary data pixbuf: %s",
+ error != NULL ? (error->message != NULL ? error->message :
_("No detail"))
+ : _("No detail"));
+ }
+ g_object_unref (istream);
+ }
#endif
if (!saved) {
@@ -1385,13 +1393,17 @@ rich_text_node_to_html (RenderingContext *context, xmlNodePtr top_parent, RtNode
g_free (tmp);
#ifdef HAVE_GDKPIXBUF
- GdkPixdata pixdata;
- if (gda_binary_get_data (rtnode->binary) &&
- gdk_pixdata_deserialize (&pixdata, gda_binary_get_size (rtnode->binary),
- (guint8*) gda_binary_get_data (rtnode->binary), NULL)) {
- GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_from_pixdata (&pixdata, TRUE, NULL);
- if (pixbuf) {
+ GInputStream *istream;
+ gpointer data;
+ GError *error = NULL;
+ data = gda_binary_get_data (rtnode->binary);
+ if (data != NULL) {
+ istream = g_memory_input_stream_new_from_data (data,
+ gda_binary_get_size
(rtnode->binary),
+ NULL);
+ GdkPixbuf *pixbuf = NULL;
+ pixbuf = gdk_pixbuf_new_from_stream (istream, NULL, &error );
+ if (pixbuf) {
/* write to file */
if (gdk_pixbuf_save (pixbuf, file, "jpeg", NULL,
"quality", "100", NULL)) {
@@ -1399,10 +1411,14 @@ rich_text_node_to_html (RenderingContext *context, xmlNodePtr top_parent, RtNode
saved = TRUE;
type = 0;
}
-
g_object_unref (pixbuf);
- }
- }
+ } else {
+ g_message ("Error reading binary data pixbuf: %s",
+ error != NULL ? (error->message != NULL ? error->message :
_("No detail"))
+ : _("No detail"));
+ }
+ g_object_unref (istream);
+ }
#endif
if (!saved) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]