From dfd09a028594a7bde0f9c6eb685b4e463c8eb421 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 3 Jun 2013 14:37:55 +0100 Subject: [PATCH] redo im_text() as a class --- ChangeLog | 2 +- TODO | 2 +- libvips/conversion/Makefile.am | 2 +- libvips/conversion/conversion.c | 6 + libvips/conversion/im_text.c | 257 -------------------- libvips/conversion/text.c | 360 +++++++++++++++++++++++++++++ libvips/deprecated/vips7compat.c | 22 ++ libvips/include/vips/conversion.h | 11 +- libvips/include/vips/vips7compat.h | 2 + po/POTFILES.in | 2 +- 10 files changed, 400 insertions(+), 266 deletions(-) delete mode 100644 libvips/conversion/im_text.c create mode 100644 libvips/conversion/text.c diff --git a/ChangeLog b/ChangeLog index 4621596e..8b78b523 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ it's cheap so caching doesn't help anyway - auto rshift down to 8 bits on save, if necessary - im_gaussnoise(), im_copy_file(), im_grid(), im_scale(), im_scaleps(), - im_wrap(), im_rotquad(), im_zoom(), im_subsample(), im_msb() + im_wrap(), im_rotquad(), im_zoom(), im_subsample(), im_msb() , im_text() redone as classes - add --angle option to dzsave diff --git a/TODO b/TODO index e482d706..bfd6da42 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -- can we get rid of the extra copy in vips_scale() etc. +- move other/im_makexy.c into copnversion? should sit with bvips_black()? - look at diff --git a/libvips/conversion/Makefile.am b/libvips/conversion/Makefile.am index 83f6b9cb..1b5e6c35 100644 --- a/libvips/conversion/Makefile.am +++ b/libvips/conversion/Makefile.am @@ -34,7 +34,7 @@ libconversion_la_SOURCES = \ subsample.c \ im_system.c \ im_system_image.c \ - im_text.c \ + text.c \ zoom.c AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ diff --git a/libvips/conversion/conversion.c b/libvips/conversion/conversion.c index 9b86e5c2..b8b5399d 100644 --- a/libvips/conversion/conversion.c +++ b/libvips/conversion/conversion.c @@ -132,6 +132,9 @@ vips_conversion_operation_init( void ) extern GType vips_zoom_get_type( void ); extern GType vips_subsample_get_type( void ); extern GType vips_msb_get_type( void ); +#ifdef HAVE_PANGOFT2 + extern GType vips_text_get_type( void ); +#endif /*HAVE_PANGOFT2*/ vips_copy_get_type(); vips_tile_cache_get_type(); @@ -161,6 +164,9 @@ vips_conversion_operation_init( void ) vips_zoom_get_type(); vips_subsample_get_type(); vips_msb_get_type(); +#ifdef HAVE_PANGOFT2 + vips_text_get_type(); +#endif /*HAVE_PANGOFT2*/ } /* The common part of most binary conversion diff --git a/libvips/conversion/im_text.c b/libvips/conversion/im_text.c deleted file mode 100644 index dbbe5509..00000000 --- a/libvips/conversion/im_text.c +++ /dev/null @@ -1,257 +0,0 @@ -/* im_text - * - * Written on: 20/5/04 - * 29/7/04 - * - !HAVE_PANGOFT2 was broken, thanks Kenneth - * 15/11/04 - * - gah, still broken, thanks Stefan - * 5/4/06 - * - return an error for im_text( "" ) rather than trying to make an - * empty image - * 2/2/10 - * - gtkdoc - */ - -/* - - This file is part of VIPS. - - VIPS is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA - - */ - -/* - - These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk - - */ - -#ifdef HAVE_CONFIG_H -#include -#endif /*HAVE_CONFIG_H*/ -#include - -#include -#include - -#include - -#ifdef HAVE_PANGOFT2 -#include -#include -#endif /*HAVE_PANGOFT2*/ - -#ifdef HAVE_PANGOFT2 - -static PangoLayout * -text_layout_new( PangoContext *context, - const char *text, const char *font, int width, int alignment, int dpi ) -{ - PangoLayout *layout; - PangoFontDescription *font_description; - - layout = pango_layout_new( context ); - pango_layout_set_markup( layout, text, -1 ); - - font_description = pango_font_description_from_string( font ); - pango_layout_set_font_description( layout, font_description ); - pango_font_description_free( font_description ); - - if( width > 0 ) - pango_layout_set_width( layout, width * PANGO_SCALE ); - - if( alignment < 0 || alignment > 2 ) - alignment = PANGO_ALIGN_RIGHT; - pango_layout_set_alignment( layout, (PangoAlignment) alignment ); - - return( layout ); -} - -static int -text_ft_to_vips( FT_Bitmap *bitmap, IMAGE *out ) -{ - int y; - - if( im_outcheck( out ) ) - return( -1 ); - im_initdesc( out, bitmap->width, bitmap->rows, 1, - IM_BBITS_BYTE, IM_BANDFMT_UCHAR, - IM_CODING_NONE, IM_TYPE_B_W, 1.0, 1.0, 0, 0 ); - if( im_setupout( out ) ) - return( -1 ); - - for( y = 0; y < bitmap->rows; y++ ) - if( im_writeline( y, out, - (VipsPel *) bitmap->buffer + y * bitmap->pitch ) ) - return( -1 ); - - return( 0 ); -} - -static int -text_layout_render_to_image( PangoLayout *layout, IMAGE *out ) -{ - PangoRectangle logical_rect; - FT_Bitmap bitmap; - int left; - int top; - int width; - int height; - - pango_layout_get_extents( layout, NULL, &logical_rect ); - -#ifdef DEBUG - printf( "logical left = %d, top = %d, width = %d, height = %d\n", - PANGO_PIXELS( logical_rect.x ), - PANGO_PIXELS( logical_rect.y ), - PANGO_PIXELS( logical_rect.width ), - PANGO_PIXELS( logical_rect.height ) ); -#endif /*DEBUG*/ - - left = PANGO_PIXELS( logical_rect.x ); - top = PANGO_PIXELS( logical_rect.y ); - width = PANGO_PIXELS( logical_rect.width ); - height = PANGO_PIXELS( logical_rect.height ); - - /* Can happen for "", for example. - */ - if( width == 0 || height == 0 ) { - im_error( "im_text", - "%s", _( "no text to render" ) ); - return( -1 ); - } - - bitmap.width = width; - bitmap.pitch = (bitmap.width + 3) & ~3; - bitmap.rows = height; - if( !(bitmap.buffer = im_malloc( NULL, bitmap.pitch * bitmap.rows )) ) - return( -1 ); - bitmap.num_grays = 256; - bitmap.pixel_mode = ft_pixel_mode_grays; - memset( bitmap.buffer, 0x00, bitmap.pitch * bitmap.rows ); - - if( pango_layout_get_width( layout ) != -1 ) - pango_ft2_render_layout( &bitmap, layout, -left, -top ); - else - pango_ft2_render_layout( &bitmap, layout, 0, 0 ); - if( text_ft_to_vips( &bitmap, out ) ) { - im_free( bitmap.buffer ); - return( -1 ); - } - - im_free( bitmap.buffer ); - - return( 0 ); -} - -static int -text_render_to_image( PangoContext *context, IMAGE *out, - const char *text, const char *font, int width, int alignment, int dpi ) -{ - PangoLayout *layout; - - if( !(layout = text_layout_new( context, text, font, - width, alignment, dpi )) ) - return( -1 ); - - if( text_layout_render_to_image( layout, out ) ) { - g_object_unref( layout ); - return( -1 ); - } - - g_object_unref( layout ); - - return( 0 ); -} - -/** - * im_text: - * @out: output image - * @text: utf-8 text string to render - * @font: font to render with - * @width: render within this many pixels across - * @alignment: left/centre/right alignment - * @dpi: render at this resolution - * - * Draw the string @text to an image. @out is a one-band 8-bit - * unsigned char image, with 0 for no text and 255 for text. Values inbetween - * are used for anti-aliasing. - * - * @text is the text to render as a UTF-8 string. It can contain Pango markup, - * for example "<i>The</i>Guardian". - * - * @font is the font to render with, selected by fontconfig. Examples might be - * "sans 12" or perhaps "bitstream charter bold 10". - * - * @width is the maximum number of pixels across to draw within. If the - * generated text is wider than this, it will wrap to a new line. In this - * case, @alignment can be used to set the alignment style for multi-line - * text. 0 means left-align, 1 centre, 2 right-align. - * - * @dpi sets the resolution to render at. "sans 12" at 72 dpi draws characters - * approximately 12 pixels high. - * - * See also: im_make_xy(), im_black(), im_gaussnoise(). - * - * Returns: 0 on success, -1 on error - */ -int -im_text( IMAGE *out, const char *text, const char *font, - int width, int alignment, int dpi ) -{ - static PangoFontMap *fontmap = NULL; - PangoContext *context; - - if( !pango_parse_markup( text, -1, 0, NULL, NULL, NULL, NULL ) ) { - im_error( "im_text", - "%s", _( "invalid markup in text" ) ); - return( -1 ); - } - - /* Just have one of these, ever. It doesn't close properly when we - * _unref(), so keep it around for reuse. - */ - if( !fontmap ) - fontmap = pango_ft2_font_map_new(); - - pango_ft2_font_map_set_resolution( PANGO_FT2_FONT_MAP( fontmap ), - dpi, dpi ); - context = pango_font_map_create_context( PANGO_FONT_MAP( fontmap ) ); - - if( text_render_to_image( context, out, text, font, - width, alignment, dpi ) ) { - g_object_unref( context ); - return( -1 ); - } - - g_object_unref( context ); - - return( 0 ); -} - -#else /*!HAVE_PANGOFT2*/ - -int -im_text( IMAGE *out, const char *text, const char *font, - int width, int alignment, int dpi ) -{ - im_error( "im_text", - "%s", _( "pangoft2 support disabled" ) ); - - return( -1 ); -} - -#endif /*HAVE_PANGOFT2*/ diff --git a/libvips/conversion/text.c b/libvips/conversion/text.c new file mode 100644 index 00000000..e31b0f90 --- /dev/null +++ b/libvips/conversion/text.c @@ -0,0 +1,360 @@ +/* vips_text + * + * Written on: 20/5/04 + * 29/7/04 + * - !HAVE_PANGOFT2 was broken, thanks Kenneth + * 15/11/04 + * - gah, still broken, thanks Stefan + * 5/4/06 + * - return an error for im_text( "" ) rather than trying to make an + * empty image + * 2/2/10 + * - gtkdoc + * 3/6/13 + * - rewrite as a class + */ + +/* + + This file is part of VIPS. + + VIPS is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA + + */ + +/* + + These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk + + */ + +#ifdef HAVE_CONFIG_H +#include +#endif /*HAVE_CONFIG_H*/ +#include + +#ifdef HAVE_PANGOFT2 + +#include +#include + +#include + +#include +#include + +#include "conversion.h" + +typedef struct _VipsText { + VipsConversion parent_instance; + + char *text; + char *font; + int width; + VipsAlign align; + int dpi; + + FT_Bitmap bitmap; + PangoContext *context; + PangoLayout *layout; + +} VipsText; + +typedef VipsConversionClass VipsTextClass; + +G_DEFINE_TYPE( VipsText, vips_text, VIPS_TYPE_CONVERSION ); + +/* Just have one of these and reuse it. + * + * This does not unref cleanly on many platforms, so we will leak horribly + * unless we reuse it. Sadly this means vips_text() needs to use a lock + * internally to single-thread text rendering. + */ +static PangoFontMap *vips_text_fontmap = NULL; + +/* ... single-thread the body of vips_text() with this. + */ +static GMutex *vips_text_lock = NULL; + +static void +vips_text_dispose( GObject *gobject ) +{ + VipsText *text = (VipsText *) gobject; + + VIPS_UNREF( text->layout ); + VIPS_UNREF( text->context ); + VIPS_FREE( text->bitmap.buffer ); + + G_OBJECT_CLASS( vips_text_parent_class )->dispose( gobject ); +} + +static PangoLayout * +text_layout_new( PangoContext *context, + const char *text, const char *font, int width, + VipsAlign align, int dpi ) +{ + PangoLayout *layout; + PangoFontDescription *font_description; + PangoAlignment palign; + + layout = pango_layout_new( context ); + pango_layout_set_markup( layout, text, -1 ); + + font_description = pango_font_description_from_string( font ); + pango_layout_set_font_description( layout, font_description ); + pango_font_description_free( font_description ); + + if( width > 0 ) + pango_layout_set_width( layout, width * PANGO_SCALE ); + + switch( align ) { + case VIPS_ALIGN_LOW: + palign = PANGO_ALIGN_LEFT; + break; + + case VIPS_ALIGN_CENTRE: + palign = PANGO_ALIGN_CENTER; + break; + + case VIPS_ALIGN_HIGH: + palign = PANGO_ALIGN_RIGHT; + break; + + default: + palign = PANGO_ALIGN_LEFT; + break; + } + pango_layout_set_alignment( layout, palign ); + + return( layout ); +} + +static int +vips_text_build( VipsObject *object ) +{ + VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object ); + VipsConversion *conversion = VIPS_CONVERSION( object ); + VipsText *text = (VipsText *) object; + + PangoRectangle logical_rect; + int left; + int top; + int width; + int height; + int y; + + if( VIPS_OBJECT_CLASS( vips_text_parent_class )->build( object ) ) + return( -1 ); + + if( !pango_parse_markup( text->text, -1, 0, NULL, NULL, NULL, NULL ) ) { + vips_error( class->nickname, + "%s", _( "invalid markup in text" ) ); + return( -1 ); + } + + if( !text->font ) + g_object_set( text, "font", "sans 12", NULL ); + + g_mutex_lock( vips_text_lock ); + + if( !vips_text_fontmap ) + vips_text_fontmap = pango_ft2_font_map_new(); + + pango_ft2_font_map_set_resolution( + PANGO_FT2_FONT_MAP( vips_text_fontmap ), text->dpi, text->dpi ); + text->context = pango_font_map_create_context( + PANGO_FONT_MAP( vips_text_fontmap ) ); + + if( !(text->layout = text_layout_new( text->context, + text->text, text->font, text->width, text->align, text->dpi )) ) + return( -1 ); + + pango_layout_get_extents( text->layout, NULL, &logical_rect ); + +#ifdef DEBUG + printf( "logical left = %d, top = %d, width = %d, height = %d\n", + PANGO_PIXELS( logical_rect.x ), + PANGO_PIXELS( logical_rect.y ), + PANGO_PIXELS( logical_rect.width ), + PANGO_PIXELS( logical_rect.height ) ); +#endif /*DEBUG*/ + + left = PANGO_PIXELS( logical_rect.x ); + top = PANGO_PIXELS( logical_rect.y ); + width = PANGO_PIXELS( logical_rect.width ); + height = PANGO_PIXELS( logical_rect.height ); + + /* Can happen for "", for example. + */ + if( width == 0 || height == 0 ) { + vips_error( class->nickname, "%s", _( "no text to render" ) ); + return( -1 ); + } + + text->bitmap.width = width; + text->bitmap.pitch = (text->bitmap.width + 3) & ~3; + text->bitmap.rows = height; + if( !(text->bitmap.buffer = + im_malloc( NULL, text->bitmap.pitch * text->bitmap.rows )) ) + return( -1 ); + text->bitmap.num_grays = 256; + text->bitmap.pixel_mode = ft_pixel_mode_grays; + memset( text->bitmap.buffer, 0x00, + text->bitmap.pitch * text->bitmap.rows ); + + if( pango_layout_get_width( text->layout ) != -1 ) + pango_ft2_render_layout( &text->bitmap, text->layout, + -left, -top ); + else + pango_ft2_render_layout( &text->bitmap, text->layout, 0, 0 ); + + vips_image_init_fields( conversion->out, + text->bitmap.width, text->bitmap.rows, 1, + VIPS_FORMAT_UCHAR, VIPS_CODING_NONE, VIPS_INTERPRETATION_B_W, + 1.0, 1.0 ); + vips_demand_hint( conversion->out, + VIPS_DEMAND_STYLE_ANY, NULL ); + + for( y = 0; y < text->bitmap.rows; y++ ) + if( vips_image_write_line( conversion->out, y, + (VipsPel *) text->bitmap.buffer + + y * text->bitmap.pitch ) ) + return( -1 ); + + return( 0 ); +} + +static void * +vips_text_make_lock( void *client ) +{ + if( !vips_text_lock ) + vips_text_lock = vips_g_mutex_new(); + + return( NULL ); +} + +static void +vips_text_class_init( VipsTextClass *class ) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS( class ); + VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class ); + + static GOnce once = G_ONCE_INIT; + + (void) g_once( &once, vips_text_make_lock, NULL ); + + gobject_class->dispose = vips_text_dispose; + gobject_class->set_property = vips_object_set_property; + gobject_class->get_property = vips_object_get_property; + + vobject_class->nickname = "text"; + vobject_class->description = _( "make a text image" ); + vobject_class->build = vips_text_build; + + VIPS_ARG_STRING( class, "text", 4, + _( "Text" ), + _( "Text to render" ), + VIPS_ARGUMENT_REQUIRED_INPUT, + G_STRUCT_OFFSET( VipsText, text ), + NULL ); + + VIPS_ARG_STRING( class, "font", 4, + _( "Font" ), + _( "Font to render width" ), + VIPS_ARGUMENT_OPTIONAL_INPUT, + G_STRUCT_OFFSET( VipsText, font ), + NULL ); + + VIPS_ARG_INT( class, "width", 4, + _( "Width" ), + _( "Maximum image width in pixels" ), + VIPS_ARGUMENT_OPTIONAL_INPUT, + G_STRUCT_OFFSET( VipsText, width ), + 0, 1000000, 0 ); + + VIPS_ARG_ENUM( class, "align", 5, + _( "Align" ), + _( "Align on the low, centre or high coordinate edge" ), + VIPS_ARGUMENT_OPTIONAL_INPUT, + G_STRUCT_OFFSET( VipsText, align ), + VIPS_TYPE_ALIGN, VIPS_ALIGN_LOW ); + + VIPS_ARG_INT( class, "dpi", 4, + _( "DPI" ), + _( "DPI to render at" ), + VIPS_ARGUMENT_OPTIONAL_INPUT, + G_STRUCT_OFFSET( VipsText, dpi ), + 1, 1000000, 72 ); + +} + +static void +vips_text_init( VipsText *text ) +{ + text->align = VIPS_ALIGN_LOW; + text->dpi = 72; + text->bitmap.buffer = NULL; +} + +/** + * vips_text: + * @out: output image + * @text: utf-8 text string to render + * @...: %NULL-terminated list of optional named arguments + * + * Optional arguments: + * + * @font: font to render with + * @width: render within this many pixels across + * @alignment: left/centre/right alignment + * @dpi: render at this resolution + * + * Draw the string @text to an image. @out is a one-band 8-bit + * unsigned char image, with 0 for no text and 255 for text. Values inbetween + * are used for anti-aliasing. + * + * @text is the text to render as a UTF-8 string. It can contain Pango markup, + * for example "<i>The</i>Guardian". + * + * @font is the font to render with, as a fontconfig name. Examples might be + * "sans 12" or perhaps "bitstream charter bold 10". + * + * @width is the maximum number of pixels across to draw within. If the + * generated text is wider than this, it will wrap to a new line. In this + * case, @alignment can be used to set the alignment style for multi-line + * text. 0 means left-align, 1 centre, 2 right-align. + * + * @dpi sets the resolution to render at. "sans 12" at 72 dpi draws characters + * approximately 12 pixels high. + * + * See also: vips_make_xy(), vips_text(), vips_gaussnoise(). + * + * Returns: 0 on success, -1 on error + */ +int +vips_text( VipsImage **out, const char *text, ... ) +{ + va_list ap; + int result; + + va_start( ap, text ); + result = vips_call_split( "text", ap, out, text ); + va_end( ap ); + + return( result ); +} + +#endif /*HAVE_PANGOFT2*/ diff --git a/libvips/deprecated/vips7compat.c b/libvips/deprecated/vips7compat.c index 07d2bcf2..13a28bab 100644 --- a/libvips/deprecated/vips7compat.c +++ b/libvips/deprecated/vips7compat.c @@ -1559,6 +1559,28 @@ im_msb_band( VipsImage *in, VipsImage *out, int band ) return( 0 ); } +int +im_text( IMAGE *out, const char *text, const char *font, + int width, int align, int dpi ) +{ + VipsImage *t; + + if( vips_text( &t, text, + "font", font, + "width", width, + "align", align, + "dpi", dpi, + NULL ) ) + return( -1 ); + if( vips_image_write( t, out ) ) { + g_object_unref( t ); + return( -1 ); + } + g_object_unref( t ); + + return( 0 ); +} + int im_wrap( IMAGE *in, IMAGE *out, int x, int y ) { diff --git a/libvips/include/vips/conversion.h b/libvips/include/vips/conversion.h index 4ab54c60..70cadab7 100644 --- a/libvips/include/vips/conversion.h +++ b/libvips/include/vips/conversion.h @@ -110,6 +110,8 @@ typedef enum { * Operations like vips_join() need to be told whether to align images on the * low or high coordinate edge, or centre. * + * + * * See also: vips_join(). */ typedef enum { @@ -194,6 +196,8 @@ int vips_grid( VipsImage *in, VipsImage **out, __attribute__((sentinel)); int vips_wrap( VipsImage *in, VipsImage **out, ... ) __attribute__((sentinel)); +int vips_rot( VipsImage *in, VipsImage **out, VipsAngle angle, ... ) + __attribute__((sentinel)); int vips_zoom( VipsImage *in, VipsImage **out, int xfac, int yfac, ... ) __attribute__((sentinel)); int vips_subsample( VipsImage *in, VipsImage **out, int xfac, int yfac, ... ) @@ -248,9 +252,9 @@ int vips_recomb( VipsImage *in, VipsImage **out, VipsImage *m, ... ) int vips_black( VipsImage **out, int width, int height, ... ) __attribute__((sentinel)); -int vips_gaussnoise( VipsImage **out, int width, int height, ... ) +int vips_text( VipsImage **out, const char *text, ... ) __attribute__((sentinel)); -int vips_rot( VipsImage *in, VipsImage **out, VipsAngle angle, ... ) +int vips_gaussnoise( VipsImage **out, int width, int height, ... ) __attribute__((sentinel)); int vips_ifthenelse( VipsImage *cond, VipsImage *in1, VipsImage *in2, @@ -265,9 +269,6 @@ int vips_flatten( VipsImage *in, VipsImage **out, ... ) int im_falsecolour( VipsImage *in, VipsImage *out ); -int im_text( VipsImage *out, const char *text, const char *font, - int width, int alignment, int dpi ); - int im_insertset( VipsImage *main, VipsImage *sub, VipsImage *out, int n, int *x, int *y ); int im_system( VipsImage *im, const char *cmd, char **out ); diff --git a/libvips/include/vips/vips7compat.h b/libvips/include/vips/vips7compat.h index 505aa4fc..098d4d8d 100644 --- a/libvips/include/vips/vips7compat.h +++ b/libvips/include/vips/vips7compat.h @@ -719,6 +719,8 @@ int im_msb( VipsImage *in, VipsImage *out ); int im_msb_band( VipsImage *in, VipsImage *out, int band ); int im_zoom( VipsImage *in, VipsImage *out, int xfac, int yfac ); int im_subsample( VipsImage *in, VipsImage *out, int xshrink, int yshrink ); +int im_text( VipsImage *out, const char *text, const char *font, + int width, int alignment, int dpi ); int im_c2amph( VipsImage *in, VipsImage *out ); int im_c2rect( VipsImage *in, VipsImage *out ); diff --git a/po/POTFILES.in b/po/POTFILES.in index a94e4b1c..a56c43f7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -73,7 +73,7 @@ libvips/conversion/rot.c libvips/conversion/scale.c libvips/conversion/replicate.c libvips/conversion/join.c -libvips/conversion/im_text.c +libvips/conversion/text.c libvips/conversion/conver_dispatch.c libvips/conversion/wrap.c libvips/conversion/insert.c