Changeset 1685c92307787c48715d390192596f36ce21d791

Timestamp:

19/07/06 14:54:13 (2 years ago)

Author:

Olivier Aubert <olivier.aubert@liris.cnrs.fr>

git-committer:

Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1153313653 +0000

git-parent:

[5ca8805a8f359c45f477e123ea5a97c6a3276373]

git-author:

Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1153313653 +0000

Message:

modules/misc/svg.c: fix SVG rendering

Files:

• modules/misc/svg.c (modified) (6 diffs)

modules/misc/svg.c

@@ -37 +37 @@
-#   include <sys/types.h>
-#endif
-#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
@@ -45 +44 @@
-#endif
-
+#include <glib.h>
+#include <glib/gstdio.h>
-#include <glib-object.h>                                  /* g_object_unref( ) */
-#include <librsvg-2/librsvg/rsvg.h>
@@ -147 +148 @@
-
-    /* MUST call this before any RSVG funcs */
-g_type_init (
+rsvg_init( 
-
-    return VLC_SUCCESS;
@@ -235 +236 @@
-    free( p_sys->psz_template );
-    free( p_sys );
+    rsvg_term( );
-}
-
@@ -262 +264 @@
-    if( p_svg->p_rendition == NULL ) {
-        svg_RenderPicture( p_filter, p_svg );
-
+->p_rendition
-        {
-            msg_Err( p_filter, "Cannot render SVG" );
@@ -398 +400 @@
-    GError *error = NULL;
-
+    p_svg->p_rendition = NULL;
+
-    p_handle = rsvg_handle_new();
-
+    if( !p_handle )
+    {
+        msg_Err( p_filter, "Error creating SVG reader: %s", error->message );
+        return;
+    }
+
-    rsvg_handle_set_size_callback( p_handle, svg_SizeCallback, p_filter, NULL );
-
-
-
-
-
+
+
+
-    {
-        msg_Err( p_filter, "error while rendering SVG: %s\n", error->message );
+        g_object_unref( G_OBJECT( p_handle ) );
-        return;
-    }
-
+
+
+
+
+
+
+
-
-    p_svg->p_rendition = rsvg_handle_get_pixbuf( p_handle );
-
+
+
-}
-