GnuTLS: add larger SHAs

[vlc] / modules / misc / svg.c

diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index aaa94c896e3f11eb84406253a024b653dc32b1f8..28e1b77b89139201253d238b6d5c3f732a37cd44 100644 (file)
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -72,12 +72,12 @@ static char *svg_GetTemplate( vlc_object_t *p_this );
         "for automatic string conversion" )
 
 vlc_module_begin ()
- set_category( CAT_INPUT)
- set_category( SUBCAT_INPUT_SCODEC )
- set_capability( "text renderer", 99 )
- add_shortcut( "svg" )
- add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true )
- set_callbacks( Create, Destroy )
+    set_category( CAT_INPUT )
+    set_category( SUBCAT_INPUT_SCODEC )
+    set_capability( "text renderer", 99 )
+    add_shortcut( "svg" )
+    add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true )
+    set_callbacks( Create, Destroy )
 vlc_module_end ()
 
 /**
@@ -115,7 +115,6 @@ struct filter_sys_t
     /* Default size for rendering. Initialized to the output size. */
     int            i_width;
     int            i_height;
-    vlc_mutex_t   *lock;
 };
 
 /*****************************************************************************
@@ -198,7 +197,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this )
                 msg_Dbg( p_this, "reading %ld bytes from template %s",
                          (unsigned long)s.st_size, psz_filename );
 
-                psz_template = malloc( ( s.st_size + 42 ) * sizeof( char ) );
+                psz_template = malloc( s.st_size + 42 );
                 if( !psz_template )
                 {
                     fclose( file );
@@ -415,14 +414,14 @@ static void svg_RenderPicture( filter_t *p_filter,
                  ( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ),
                  &error ) )
     {
-        msg_Err( p_filter, "error while rendering SVG: %s\n", error->message );
+        msg_Err( p_filter, "error while rendering SVG: %s", 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 );
+        msg_Err( p_filter, "error while rendering SVG (close): %s", error->message );
         g_object_unref( G_OBJECT( p_handle ) );
         return;
     }
@@ -445,7 +444,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
     psz_string = p_region_in->psz_text;
     if( !psz_string || !*psz_string ) return VLC_EGENERIC;
 
-    p_svg = ( svg_rendition_t * )malloc( sizeof( svg_rendition_t ) );
+    p_svg = malloc( sizeof( svg_rendition_t ) );
     if( !p_svg )
         return VLC_ENOMEM;
 
@@ -471,7 +470,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
         int length;
         char* psz_template = p_sys->psz_template;
         length = strlen( psz_string ) + strlen( psz_template ) + 42;
-        p_svg->psz_text = malloc( ( length + 1 ) * sizeof( char ) );
+        p_svg->psz_text = malloc( length + 1 );
         if( !p_svg->psz_text )
         {
             free( p_svg );