Changeset 6ce39aaa96863326efe66b5fa56839e71bf57211

Timestamp:

24/08/07 07:48:37 (1 year ago)

Author:

Bernie Purcell <bitmap@videolan.org>

git-committer:

Bernie Purcell <bitmap@videolan.org> 1187934517 +0000

git-parent:

[949c34951bff7d5f99de16a6f06ecd8579340cbd]

git-author:

Bernie Purcell <bitmap@videolan.org> 1187934517 +0000

Message:

Copy across damienf's mod to freetype.c in r21422 to balance vlc_object_find()
with vlc_object_release(). Also copied across some Null pointer checks.

Files:

• modules/misc/quartztext.c (modified) (5 diffs)

modules/misc/quartztext.c

@@ -203 +203 @@
-
-    if( VLC_SUCCESS != input_Control( p_input, INPUT_GET_ATTACHMENTS, &pp_attachments, &i_attachments_cnt ))
+    {
+        vlc_object_release(p_input);
-        return VLC_EGENERIC;
+    }
-
-    p_sys->i_fonts = 0;
@@ -239 +242 @@
-    free( pp_attachments );
-
+    vlc_object_release(p_input);
+
-    return rv;
-}
@@ -455 +460 @@
-
-    p_new = malloc( sizeof( font_stack_t ) );
+    if( ! p_new )
+        return VLC_ENOMEM;
+
-    p_new->p_next = NULL;
-
@@ -566 +574 @@
-    if( p_font_style )
-    {
-
-   
-   
-   
+rv = 
+
+
+
-                  p_font_style->i_font_alpha );
-
@@ -581 +589 @@
-    else
-    {
-
-
+
+
+
+
+
+
+
-
-    while ( ( xml_ReaderRead( p_xml_reader ) == 1 ) )