null pointer check in end_playlist

[melted] / src / modules / gtk2 / producer_pango.c

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index bed28f9..a7ac1fa 100644 (file)
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -31,9 +31,7 @@ struct producer_pango_s
        struct mlt_producer_s parent;
        int width;
        int height;
-       void *image_release;
        uint8_t *image;
-       void *alpha_release;
        uint8_t *alpha;
        char *fgcolor;
        char *bgcolor;
@@ -101,7 +99,6 @@ mlt_producer producer_pango_init( const char *filename )
 
                if ( filename == NULL )
                {
-                       mlt_properties_set( properties, "resource", "pango" );
                        mlt_properties_set( properties, "markup", "" );
                }
                else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) )
@@ -151,7 +148,6 @@ mlt_producer producer_pango_init( const char *filename )
                        }
                        else
                        {
-                               mlt_properties_set( properties, "resource", "pango" );
                                mlt_properties_set( properties, "markup", "" );
                        }
                }
@@ -273,10 +269,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
                rgba_color fgcolor = parse_color( this->fgcolor );
                rgba_color bgcolor = parse_color( this->bgcolor );
 
-               mlt_pool_release( this->image_release );
-               mlt_pool_release( this->alpha_release );
-               this->image_release = NULL;
-               this->alpha_release = NULL;
+               mlt_pool_release( this->image );
+               mlt_pool_release( this->alpha );
                this->image = NULL;
                this->alpha = NULL;
 
@@ -298,10 +292,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
        }
        else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) )
        {
-               mlt_pool_release( this->image_release );
-               mlt_pool_release( this->alpha_release );
-               this->image_release = NULL;
-               this->alpha_release = NULL;
+               mlt_pool_release( this->image );
+               mlt_pool_release( this->alpha );
                this->image = NULL;
                this->alpha = NULL;
 
@@ -331,8 +323,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
                this->height = height;
 
                // Allocate/define image
-               this->image = mlt_pool_allocate( width * ( height + 1 ) * 2, &this->image_release );
-               this->alpha = mlt_pool_allocate( this->width * this->height, &this->alpha_release );
+               this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
+               this->alpha = mlt_pool_alloc( this->width * this->height );
 
                // Convert the image
                mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ),
@@ -384,16 +376,14 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        if ( writable )
        {
                // Clone our image
-               void *release = NULL;
-               uint8_t *copy = mlt_pool_allocate( size, &release );
+               uint8_t *copy = mlt_pool_alloc( size );
                memcpy( copy, image, size );
 
                // We're going to pass the copy on
                image = copy;
 
                // Now update properties so we free the copy after
-               mlt_properties_set_data( properties, "image_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL );
-               mlt_properties_set_data( properties, "image", copy, size, NULL, NULL );
+               mlt_properties_set_data( properties, "image", copy, size, ( mlt_destructor )mlt_pool_release, NULL );
        }
 
        // Pass on the image
@@ -429,7 +419,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 
        // Set producer-specific frame properties
        mlt_properties_set_int( properties, "progressive", 1 );
-       mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( properties, "real_width" ) / mlt_properties_get_double( properties, "real_height" ) );
+       mlt_properties_set_double( properties, "aspect_ratio", 1 );
 
        // Set alpha call back
        ( *frame )->get_alpha_mask = producer_get_alpha_mask;
@@ -449,8 +439,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 static void producer_close( mlt_producer parent )
 {
        producer_pango this = parent->child;
-       mlt_pool_release( this->image_release );
-       mlt_pool_release( this->alpha_release );
+       mlt_pool_release( this->image );
+       mlt_pool_release( this->alpha );
        free( this->fgcolor );
        free( this->bgcolor );
        free( this->markup );
@@ -492,7 +482,6 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
        uint8_t *src = NULL;
        uint8_t* dest = NULL;
        int stride;
-       void *release = NULL;
 
        pango_ft2_font_map_set_resolution( fontmap, 72, 72 );
        pango_layout_set_width( layout, -1 ); // set wrapping constraints
@@ -515,7 +504,7 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
        bitmap.width     = w;
        bitmap.pitch     = 32 * ( ( w + 31 ) / 31 );
        bitmap.rows      = h;
-       bitmap.buffer    = mlt_pool_allocate( h * bitmap.pitch, &release );
+       bitmap.buffer    = mlt_pool_alloc( h * bitmap.pitch );
        bitmap.num_grays = 256;
        bitmap.pixel_mode = ft_pixel_mode_grays;
 
@@ -539,11 +528,10 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
                }
                dest += stride;
        }
-       mlt_pool_release( release );
+       mlt_pool_release( bitmap.buffer );
        g_object_unref( layout );
        g_object_unref( context );
        g_object_unref( fontmap );
 
        return pixbuf;
 }
-