char *markup;
char *text;
char *font;
+ int weight;
};
// special color type used by internal pango routines
static void producer_close( mlt_producer parent );
static void pango_draw_background( GdkPixbuf *pixbuf, rgba_color bg );
static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font,
- rgba_color fg, rgba_color bg, int pad, int align );
+ rgba_color fg, rgba_color bg, int pad, int align, int weight, int size );
/** Return nonzero if the two strings are equal, ignoring case, up to
the first n characters.
mlt_properties_set( properties, "text", "" );
mlt_properties_set( properties, "font", "Sans 48" );
mlt_properties_set( properties, "encoding", "UTF-8" );
+ mlt_properties_set_int( properties, "weight", PANGO_WEIGHT_NORMAL );
if ( filename == NULL )
{
iconv_t cd = iconv_open( "UTF-8", encoding );
if ( cd != ( iconv_t )-1 )
{
- char *inbuf_p = strdup( text );
+ char *inbuf_p = text;
size_t inbuf_n = strlen( text );
size_t outbuf_n = inbuf_n * 6;
char *outbuf = mlt_pool_alloc( outbuf_n );
char *outbuf_p = outbuf;
- if ( iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 )
- {
- outbuf[ outbuf_n ] = 0;
+ memset( outbuf, 0, outbuf_n );
+
+ if ( text != NULL && strcmp( text, "" ) && iconv( cd, &inbuf_p, &inbuf_n, &outbuf_p, &outbuf_n ) != -1 )
mlt_properties_set( properties, prop_name, outbuf );
- result = 0;
- }
+ else
+ mlt_properties_set( properties, prop_name, "" );
+
mlt_pool_release( outbuf );
iconv_close( cd );
+ result = 0;
}
return result;
}
char *text = mlt_properties_get( producer_props, "text" );
char *font = mlt_properties_get( producer_props, "font" );
char *encoding = mlt_properties_get( producer_props, "encoding" );
+ int weight = mlt_properties_get_int( producer_props, "weight" );
+ int size = mlt_properties_get_int( producer_props, "size" );
// See if any properties changed
int property_changed = ( align != this->align );
property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) );
property_changed = property_changed || ( text && this->text && strcmp( text, this->text ) );
property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
+ property_changed = property_changed || ( weight != this->weight );
// Save the properties for next comparison
this->align = align;
set_string( &this->markup, markup, NULL );
set_string( &this->text, text, NULL );
set_string( &this->font, font, "Sans 48" );
+ this->weight = weight;
if ( property_changed )
{
}
// Render the title
- pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align );
+ pixbuf = pango_get_pixbuf( markup, text, font, fgcolor, bgcolor, pad, align, weight, size );
if ( pixbuf != NULL )
{
{
// Clone our image
uint8_t *copy = mlt_pool_alloc( size );
- memcpy( copy, image, size );
+ if ( copy != NULL && image != NULL )
+ memcpy( copy, image, size );
// We're going to pass the copy on
image = copy;
}
}
-static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, rgba_color fg, rgba_color bg, int pad, int align )
+static PangoFT2FontMap *fontmap = NULL;
+
+static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const char *font, rgba_color fg, rgba_color bg, int pad, int align, int weight, int size )
{
- PangoFT2FontMap *fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new();
+ if ( fontmap == NULL )
+ fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new();
+
PangoContext *context = pango_ft2_font_map_create_context( fontmap );
PangoLayout *layout = pango_layout_new( context );
int w, h, x;
FT_Bitmap bitmap;
uint8_t *src = NULL;
uint8_t* dest = NULL;
+ uint8_t *d, *s, a;
int stride;
+ PangoFontDescription *desc = pango_font_description_from_string( font );
pango_ft2_font_map_set_resolution( fontmap, 72, 72 );
pango_layout_set_width( layout, -1 ); // set wrapping constraints
- pango_layout_set_font_description( layout, pango_font_description_from_string( font ) );
+ pango_font_description_set_weight( desc, ( PangoWeight ) weight );
+ if ( size != 0 )
+ pango_font_description_set_size( desc, PANGO_SCALE * size );
+ pango_layout_set_font_description( layout, desc );
// pango_layout_set_spacing( layout, space );
pango_layout_set_alignment( layout, ( PangoAlignment ) align );
if ( markup != NULL && strcmp( markup, "" ) != 0 )
else if ( text != NULL && strcmp( text, "" ) != 0 )
pango_layout_set_text( layout, text, strlen( text ) );
else
- return NULL;
+ pango_layout_set_text( layout, " ", 2 );
pango_layout_get_pixel_size( layout, &w, &h );
pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE /* has alpha */, 8, w + 2 * pad, h + 2 * pad );
src = bitmap.buffer;
x = ( gdk_pixbuf_get_width( pixbuf ) - w - 2 * pad ) * align / 2 + pad;
dest = gdk_pixbuf_get_pixels( pixbuf ) + 4 * x + pad * stride;
- for ( j = 0; j < h; j++ )
+ j = h;
+
+ while( j -- )
{
- uint8_t *d = dest;
- for ( i = 0; i < w; i++ )
+ d = dest;
+ s = src;
+ i = w;
+ while( i -- )
{
- float a = ( float ) bitmap.buffer[ j * bitmap.pitch + i ] / 255.0;
- *d++ = ( int ) ( a * fg.r + ( 1 - a ) * bg.r );
- *d++ = ( int ) ( a * fg.g + ( 1 - a ) * bg.g );
- *d++ = ( int ) ( a * fg.b + ( 1 - a ) * bg.b );
- *d++ = ( int ) ( a * fg.a + ( 1 - a ) * bg.a );
+ a = *s ++;
+ *d++ = ( a * fg.r + ( 255 - a ) * bg.r ) >> 8;
+ *d++ = ( a * fg.g + ( 255 - a ) * bg.g ) >> 8;
+ *d++ = ( a * fg.b + ( 255 - a ) * bg.b ) >> 8;
+ *d++ = ( a * fg.a + ( 255 - a ) * bg.a ) >> 8;
}
dest += stride;
+ src += bitmap.pitch;
}
mlt_pool_release( bitmap.buffer );
+ pango_font_description_free( desc );
g_object_unref( layout );
g_object_unref( context );
- g_object_unref( fontmap );
return pixbuf;
}
projects / melted / blobdiff