if ( filename == NULL )
{
- mlt_properties_set( properties, "resource", "pango" );
mlt_properties_set( properties, "markup", "" );
}
else if ( filename[ 0 ] == '+' || strstr( filename, "/+" ) )
}
else
{
- mlt_properties_set( properties, "resource", "pango" );
mlt_properties_set( properties, "markup", "" );
}
}
rgba_color fgcolor = parse_color( this->fgcolor );
rgba_color bgcolor = parse_color( this->bgcolor );
- free( this->image );
- free( this->alpha );
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
this->image = NULL;
this->alpha = NULL;
}
else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) )
{
- free( this->image );
- free( this->alpha );
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
this->image = NULL;
this->alpha = NULL;
this->height = height;
// Allocate/define image
- // IRRIGATE ME
- uint8_t *image = malloc( width * ( height + 1 ) * 2 );
- uint8_t *alpha = NULL;
-
- // Allocate the alpha mask
- alpha = malloc( this->width * this->height );
+ 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 ),
this->width, this->height,
gdk_pixbuf_get_rowstride( pixbuf ),
- image, alpha );
+ this->image, this->alpha );
// Finished with pixbuf now
g_object_unref( pixbuf );
-
- // reference the image in the producer
- this->image = image;
- this->alpha = alpha;
}
// Set width/height
if ( writable )
{
// Clone our image
- // IRRIGATE ME
- uint8_t *copy = malloc( size );
+ 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", copy, size, free, NULL );
+ mlt_properties_set_data( properties, "image", copy, size, ( mlt_destructor )mlt_pool_release, NULL );
}
// Pass on the image
// 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;
static void producer_close( mlt_producer parent )
{
producer_pango this = parent->child;
- free( this->image );
- free( this->alpha );
+ mlt_pool_release( this->image );
+ mlt_pool_release( this->alpha );
free( this->fgcolor );
free( this->bgcolor );
free( this->markup );
bitmap.width = w;
bitmap.pitch = 32 * ( ( w + 31 ) / 31 );
bitmap.rows = h;
- bitmap.buffer = ( unsigned char * ) calloc( 1, h * bitmap.pitch );
+ bitmap.buffer = mlt_pool_alloc( h * bitmap.pitch );
bitmap.num_grays = 256;
bitmap.pixel_mode = ft_pixel_mode_grays;
+ memset( bitmap.buffer, 0, h * bitmap.pitch );
+
pango_ft2_render_layout( &bitmap, layout, 0, 0 );
src = bitmap.buffer;
}
dest += stride;
}
- free( bitmap.buffer );
-
+ mlt_pool_release( bitmap.buffer );
g_object_unref( layout );
g_object_unref( context );
g_object_unref( fontmap );
return pixbuf;
}
-