Removes trailing spaces. Removes tabs.

[vlc] / modules / misc / svg.c

diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index e6038262916bb7de8b35ac13b395456d00bb078e..2e9944ccd47bcd8306996fbba4e0a50e2825e607 100644 (file)
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -24,13 +24,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc( ), free( ) */
-#include <string.h>
+
+#include <vlc/vlc.h>
+#include <vlc_charset.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #   include <sys/types.h>
 #endif
-#include <sys/stat.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
@@ -38,12 +42,8 @@
 #   include <io.h>
 #endif
 
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include "vlc_osd.h"
-#include "vlc_block.h"
-#include "vlc_filter.h"
-
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <glib-object.h>                                  /* g_object_unref( ) */
 #include <librsvg-2/librsvg/rsvg.h>
 
@@ -56,7 +56,7 @@ static int  Create    ( vlc_object_t * );
 static void Destroy   ( vlc_object_t * );
 static int  RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
                         subpicture_region_t *p_region_in );
-
+static char *svg_GetTemplate( vlc_object_t *p_this );
 
 /*****************************************************************************
  * Module descriptor
@@ -69,7 +69,7 @@ static int  RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
 vlc_module_begin();
  set_category( CAT_INPUT);
  set_category( SUBCAT_INPUT_SCODEC );
- set_capability( "text renderer", 101 );
+ set_capability( "text renderer", 99 );
  add_shortcut( "svg" );
  add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, VLC_TRUE );
  set_callbacks( Create, Destroy );
@@ -136,6 +136,7 @@ static int Create( vlc_object_t *p_this )
     if( !p_sys->psz_template )
     {
         msg_Err( p_filter, "out of memory" );
+        free( p_sys );
         return VLC_ENOMEM;
     }
 
@@ -143,10 +144,11 @@ static int Create( vlc_object_t *p_this )
     p_sys->i_height = p_filter->fmt_out.video.i_height;
 
     p_filter->pf_render_text = RenderText;
+    p_filter->pf_render_html = NULL;
     p_filter->p_sys = p_sys;
 
     /* MUST call this before any RSVG funcs */
-    g_type_init ();
+    rsvg_init( );
 
     return VLC_SUCCESS;
 }
@@ -159,7 +161,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this )
     FILE *file;
 
     psz_filename = config_GetPsz( p_filter, "svg-template-file" );
-    if( !psz_filename || psz_filename[0] == 0 )
+    if( !psz_filename || (psz_filename[0] == 0) )
     {
         /* No filename. Use a default value. */
         psz_template = NULL;
@@ -234,6 +236,7 @@ static void Destroy( vlc_object_t *p_this )
 
     free( p_sys->psz_template );
     free( p_sys );
+    rsvg_term( );
 }
 
 /*****************************************************************************
@@ -261,7 +264,7 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region,
 
     if( p_svg->p_rendition == NULL ) {
         svg_RenderPicture( p_filter, p_svg );
-        if( ! p_svg )
+        if( ! p_svg->p_rendition )
         {
             msg_Err( p_filter, "Cannot render SVG" );
             return VLC_EGENERIC;
@@ -397,22 +400,37 @@ static void svg_RenderPicture( filter_t *p_filter,
     RsvgHandle *p_handle;
     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 );
 
-    rsvg_handle_write( p_handle,
-                       ( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ) + 1,
-                       &error );
-    if( error != NULL )
+    if( ! rsvg_handle_write( p_handle,
+                 ( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ),
+                 &error ) )
     {
         msg_Err( p_filter, "error while rendering SVG: %s\n", error->message );
+        g_object_unref( G_OBJECT( p_handle ) );
+        return;
+    }
+
+    if( ! rsvg_handle_close( p_handle, &error ) )
+    {
+        msg_Err( p_filter, "error while rendering SVG (close): %s\n", error->message );
+        g_object_unref( G_OBJECT( p_handle ) );
         return;
     }
-    rsvg_handle_close( p_handle, &error );
 
     p_svg->p_rendition = rsvg_handle_get_pixbuf( p_handle );
-    rsvg_handle_free( p_handle );
+
+    g_object_unref( G_OBJECT( p_handle ) );
 }