From 8412b8233c8f37ab00dc85f4e9976df191da242c Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Apr 2021 10:59:50 +0100 Subject: [PATCH 1/7] start adding colour text rendering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit try eg. vips text x.png 😀 --rgba --dpi 300 But it's not working :( need to tyweak something else? --- libvips/create/text.c | 57 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/libvips/create/text.c b/libvips/create/text.c index a750c8ec..bfa6dd4d 100644 --- a/libvips/create/text.c +++ b/libvips/create/text.c @@ -94,6 +94,7 @@ typedef struct _VipsText { gboolean justify; int dpi; char *fontfile; + gboolean rgba; FT_Bitmap bitmap; PangoContext *context; @@ -342,6 +343,9 @@ vips_text_build( VipsObject *object ) VipsText *text = (VipsText *) object; VipsRect extents; + int bands; + VipsInterpretation interpretation; + FT_Pixel_Mode pixel_mode; int y; if( VIPS_OBJECT_CLASS( vips_text_parent_class )->build( object ) ) @@ -399,8 +403,19 @@ vips_text_build( VipsObject *object ) return( -1 ); } + if( text->rgba ) { + interpretation = VIPS_INTERPRETATION_sRGB; + bands = 4; + pixel_mode = FT_PIXEL_MODE_BGRA; + } + else { + interpretation = VIPS_INTERPRETATION_MULTIBAND; + bands = 1; + pixel_mode = FT_PIXEL_MODE_GRAY; + } + text->bitmap.width = extents.width; - text->bitmap.pitch = (text->bitmap.width + 3) & ~3; + text->bitmap.pitch = (bands * text->bitmap.width + 3) & ~3; text->bitmap.rows = extents.height; if( !(text->bitmap.buffer = VIPS_ARRAY( NULL, @@ -409,25 +424,31 @@ vips_text_build( VipsObject *object ) return( -1 ); } text->bitmap.num_grays = 256; - text->bitmap.pixel_mode = ft_pixel_mode_grays; + text->bitmap.pixel_mode = pixel_mode; memset( text->bitmap.buffer, 0x00, text->bitmap.pitch * text->bitmap.rows ); pango_ft2_render_layout( &text->bitmap, text->layout, -extents.left, -extents.top ); + /* Set DPI as pixels/mm. + */ + vips_image_init_fields( create->out, + text->bitmap.width, text->bitmap.rows, bands, + VIPS_FORMAT_UCHAR, VIPS_CODING_NONE, + interpretation, text->dpi / 25.4, text->dpi / 25.4 ); + g_mutex_unlock( vips_text_lock ); - vips_image_init_fields( create->out, - text->bitmap.width, text->bitmap.rows, 1, - VIPS_FORMAT_UCHAR, VIPS_CODING_NONE, - VIPS_INTERPRETATION_MULTIBAND, - 1.0, 1.0 ); - vips_image_pipelinev( create->out, - VIPS_DEMAND_STYLE_ANY, NULL ); + vips_image_pipelinev( create->out, VIPS_DEMAND_STYLE_ANY, NULL ); create->out->Xoffset = extents.left; create->out->Yoffset = extents.top; + if( text->rgba ) { + /* Convert premultiplied BGRA to RGBA. + */ + } + for( y = 0; y < text->bitmap.rows; y++ ) if( vips_image_write_line( create->out, y, (VipsPel *) text->bitmap.buffer + @@ -534,6 +555,13 @@ vips_text_class_init( VipsTextClass *class ) G_STRUCT_OFFSET( VipsText, fontfile ), NULL ); + VIPS_ARG_BOOL( class, "rgba", 9, + _( "RGBA" ), + _( "Enable RGBA output" ), + VIPS_ARGUMENT_OPTIONAL_INPUT, + G_STRUCT_OFFSET( VipsText, rgba ), + FALSE ); + } static void @@ -563,17 +591,22 @@ vips_text_init( VipsText *text ) * * @justify: %gboolean, justify lines * * @dpi: %gint, render at this resolution * * @autofit_dpi: %gint, read out auto-fitted DPI + * * @rgba: %gboolean, enable RGBA output * * @spacing: %gint, space lines by this in points * - * Draw the string @text to an image. @out is a one-band 8-bit + * Draw the string @text to an image. @out is normally a one-band 8-bit * unsigned char image, with 0 for no text and 255 for text. Values between * are used for anti-aliasing. * + * Set @rgba to enable RGBA output. This is useful for colour emoji rendering, + * or support for pango markup features like `Red!`. + * * @text is the text to render as a UTF-8 string. It can contain Pango markup, - * for example "<i>The</i>Guardian". + * for example `TheGuardian`. * * @font is the font to render with, as a fontconfig name. Examples might be - * "sans 12" or perhaps "bitstream charter bold 10". + * `sans 12` or perhaps `bitstream charter bold 10`. * * You can specify a font to load with @fontfile. You'll need to also set the * name of the font with @font. From f53959b82475946a3f9b29d0ac98d34a9b906d5f Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Apr 2021 15:11:18 +0100 Subject: [PATCH 2/7] switch font rendering to pangocairo to make colour font rendering work --- ChangeLog | 1 + configure.ac | 30 +++++++------- libvips/create/create.c | 8 ++-- libvips/create/text.c | 88 ++++++++++++++++++++++------------------- 4 files changed, 67 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67264ff7..ef45770b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ - add vips_image_[set|get]_array_double() - add GIF load with libnsgif - add JPEG2000 load and save +- add "rgba" flag to vips_text() to enable full colour text rendering 22/12/20 start 8.10.6 - don't seek on bad file descriptors [kleisauke] diff --git a/configure.ac b/configure.ac index 9f906b8c..1a7c5ace 100644 --- a/configure.ac +++ b/configure.ac @@ -1083,25 +1083,25 @@ fi VIPS_CFLAGS="$VIPS_CFLAGS $LIBWEBP_CFLAGS" VIPS_LIBS="$VIPS_LIBS $LIBWEBP_LIBS" -# pangoft2 -AC_ARG_WITH([pangoft2], - AS_HELP_STRING([--without-pangoft2], - [build without pangoft2 (default: test)])) +# pangocairo for text rendering +AC_ARG_WITH([pangocairo], + AS_HELP_STRING([--without-pangocairo], + [build without pangocairo (default: test)])) -if test x"$with_pangoft2" != x"no"; then - PKG_CHECK_MODULES(PANGOFT2, pangoft2, - [AC_DEFINE(HAVE_PANGOFT2,1,[define if you have pangoft2 installed.]) - with_pangoft2=yes - PACKAGES_USED="$PACKAGES_USED pangoft2" +if test x"$with_pangocairo" != x"no"; then + PKG_CHECK_MODULES(PANGOCAIRO, pangocairo, + [AC_DEFINE(HAVE_PANGOCAIRO,1,[define if you have pangocairo installed.]) + with_pangocairo=yes + PACKAGES_USED="$PACKAGES_USED pangocairo" ], - [AC_MSG_WARN([pangoft2 not found; disabling pangoft2 support]) - with_pangoft2=no + [AC_MSG_WARN([pangocairo not found; disabling pangocairo support]) + with_pangocairo=no ] ) fi -VIPS_CFLAGS="$VIPS_CFLAGS $PANGOFT2_CFLAGS" -VIPS_LIBS="$VIPS_LIBS $PANGOFT2_LIBS" +VIPS_CFLAGS="$VIPS_CFLAGS $PANGOCAIRO_CFLAGS" +VIPS_LIBS="$VIPS_LIBS $PANGOCAIRO_LIBS" # look for TIFF with pkg-config ... fall back to our tester # pkgconfig support for libtiff starts with libtiff-4 @@ -1325,7 +1325,7 @@ use fftw3 for FFT: $with_fftw, \ accelerate loops with orc: $with_orc, \ ICC profile support with lcms: $with_lcms, \ zlib: $with_zlib, \ -text rendering with pangoft2: $with_pangoft2, \ +text rendering with pangocairo: $with_pangocairo, \ EXIF metadata support with libexif: $with_libexif, \ JPEG load/save with libjpeg: $with_jpeg, \ PNG load with libspng: $with_libspng, \ @@ -1427,7 +1427,7 @@ accelerate loops with orc: $with_orc (requires orc-0.4.11 or later) ICC profile support with lcms: $with_lcms zlib: $with_zlib -text rendering with pangoft2: $with_pangoft2 +text rendering with pangocairo: $with_pangocairo EXIF metadata support with libexif: $with_libexif ## File format support diff --git a/libvips/create/create.c b/libvips/create/create.c index 93c35796..de1da74c 100644 --- a/libvips/create/create.c +++ b/libvips/create/create.c @@ -116,9 +116,9 @@ vips_create_operation_init( void ) extern GType vips_gaussmat_get_type( void ); extern GType vips_logmat_get_type( void ); extern GType vips_gaussnoise_get_type( void ); -#ifdef HAVE_PANGOFT2 +#ifdef HAVE_PANGOCAIRO extern GType vips_text_get_type( void ); -#endif /*HAVE_PANGOFT2*/ +#endif /*HAVE_PANGOCAIRO*/ extern GType vips_xyz_get_type( void ); extern GType vips_eye_get_type( void ); extern GType vips_grey_get_type( void ); @@ -146,9 +146,9 @@ vips_create_operation_init( void ) vips_gaussmat_get_type(); vips_logmat_get_type(); vips_gaussnoise_get_type(); -#ifdef HAVE_PANGOFT2 +#ifdef HAVE_PANGOCAIRO vips_text_get_type(); -#endif /*HAVE_PANGOFT2*/ +#endif /*HAVE_PANGOCAIRO*/ vips_xyz_get_type(); vips_eye_get_type(); vips_grey_get_type(); diff --git a/libvips/create/text.c b/libvips/create/text.c index bfa6dd4d..71dd9786 100644 --- a/libvips/create/text.c +++ b/libvips/create/text.c @@ -32,6 +32,9 @@ * - fitting could occasionally terminate early [levmorozov] * 16/5/20 [keiviv] * - don't add fontfiles repeatedly + * 12/4/21 + * - switch to cairo for text rendering + * - add rgba flag */ /* @@ -74,11 +77,13 @@ #include #include +#include -#ifdef HAVE_PANGOFT2 +#ifdef HAVE_PANGOCAIRO +#include #include -#include +#include #include "pcreate.h" @@ -96,7 +101,6 @@ typedef struct _VipsText { char *fontfile; gboolean rgba; - FT_Bitmap bitmap; PangoContext *context; PangoLayout *layout; @@ -130,7 +134,6 @@ vips_text_dispose( GObject *gobject ) VIPS_UNREF( text->layout ); VIPS_UNREF( text->context ); - VIPS_FREE( text->bitmap.buffer ); G_OBJECT_CLASS( vips_text_parent_class )->dispose( gobject ); } @@ -187,8 +190,8 @@ vips_text_get_extents( VipsText *text, VipsRect *extents ) PangoRectangle ink_rect; PangoRectangle logical_rect; - pango_ft2_font_map_set_resolution( - PANGO_FT2_FONT_MAP( vips_text_fontmap ), text->dpi, text->dpi ); + pango_cairo_font_map_set_resolution( + PANGO_CAIRO_FONT_MAP( vips_text_fontmap ), text->dpi ); VIPS_UNREF( text->layout ); if( !(text->layout = text_layout_new( text->context, @@ -345,8 +348,8 @@ vips_text_build( VipsObject *object ) VipsRect extents; int bands; VipsInterpretation interpretation; - FT_Pixel_Mode pixel_mode; - int y; + cairo_surface_t *surface; + cairo_t *cr; if( VIPS_OBJECT_CLASS( vips_text_parent_class )->build( object ) ) return( -1 ); @@ -360,7 +363,7 @@ vips_text_build( VipsObject *object ) g_mutex_lock( vips_text_lock ); if( !vips_text_fontmap ) - vips_text_fontmap = pango_ft2_font_map_new(); + vips_text_fontmap = pango_cairo_font_map_new(); if( !vips_text_fontfiles ) vips_text_fontfiles = g_hash_table_new( g_str_hash, g_str_equal ); @@ -368,6 +371,7 @@ vips_text_build( VipsObject *object ) text->context = pango_font_map_create_context( PANGO_FONT_MAP( vips_text_fontmap ) ); + /* if( text->fontfile && !g_hash_table_lookup( vips_text_fontfiles, text->fontfile ) ) { if( !FcConfigAppFontAddFile( NULL, @@ -382,6 +386,7 @@ vips_text_build( VipsObject *object ) text->fontfile, g_strdup( text->fontfile ) ); } + */ /* If our caller set height and not dpi, we adjust dpi until * we get a fit. @@ -406,54 +411,56 @@ vips_text_build( VipsObject *object ) if( text->rgba ) { interpretation = VIPS_INTERPRETATION_sRGB; bands = 4; - pixel_mode = FT_PIXEL_MODE_BGRA; } else { interpretation = VIPS_INTERPRETATION_MULTIBAND; bands = 1; - pixel_mode = FT_PIXEL_MODE_GRAY; } - text->bitmap.width = extents.width; - text->bitmap.pitch = (bands * text->bitmap.width + 3) & ~3; - text->bitmap.rows = extents.height; - if( !(text->bitmap.buffer = - VIPS_ARRAY( NULL, - text->bitmap.pitch * text->bitmap.rows, VipsPel )) ) { - g_mutex_unlock( vips_text_lock ); - return( -1 ); - } - text->bitmap.num_grays = 256; - text->bitmap.pixel_mode = pixel_mode; - memset( text->bitmap.buffer, 0x00, - text->bitmap.pitch * text->bitmap.rows ); - - pango_ft2_render_layout( &text->bitmap, text->layout, - -extents.left, -extents.top ); - /* Set DPI as pixels/mm. */ vips_image_init_fields( create->out, - text->bitmap.width, text->bitmap.rows, bands, + extents.width, extents.height, bands, VIPS_FORMAT_UCHAR, VIPS_CODING_NONE, interpretation, text->dpi / 25.4, text->dpi / 25.4 ); - g_mutex_unlock( vips_text_lock ); - vips_image_pipelinev( create->out, VIPS_DEMAND_STYLE_ANY, NULL ); create->out->Xoffset = extents.left; create->out->Yoffset = extents.top; - if( text->rgba ) { - /* Convert premultiplied BGRA to RGBA. - */ + if( vips_image_write_prepare( create->out ) ) { + g_mutex_unlock( vips_text_lock ); + return( -1 ); } - for( y = 0; y < text->bitmap.rows; y++ ) - if( vips_image_write_line( create->out, y, - (VipsPel *) text->bitmap.buffer + - y * text->bitmap.pitch ) ) - return( -1 ); + surface = cairo_image_surface_create_for_data( + VIPS_IMAGE_ADDR( create->out, 0, 0 ), + text->rgba ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_A8, + create->out->Xsize, create->out->Ysize, + VIPS_IMAGE_SIZEOF_LINE( create->out ) ); + cr = cairo_create( surface ); + cairo_surface_destroy( surface ); + + cairo_translate( cr, -extents.left, -extents.top ); + + pango_cairo_show_layout( cr, text->layout ); + + cairo_destroy( cr ); + + g_mutex_unlock( vips_text_lock ); + + if( text->rgba ) { + int y; + + /* Cairo makes pre-multipled BRGA -- we must byteswap and + * unpremultiply. + */ + for( y = 0; y < create->out->Ysize; y++ ) + vips__premultiplied_bgra2rgba( + (guint32 *) + VIPS_IMAGE_ADDR( create->out, 0, y ), + create->out->Xsize ); + } return( 0 ); } @@ -569,11 +576,10 @@ vips_text_init( VipsText *text ) { text->align = VIPS_ALIGN_LOW; text->dpi = 72; - text->bitmap.buffer = NULL; VIPS_SETSTR( text->font, "sans 12" ); } -#endif /*HAVE_PANGOFT2*/ +#endif /*HAVE_PANGOCAIRO*/ /** * vips_text: From 985a3e2282e635f336f036e6206ca9238b7dfd37 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Apr 2021 15:46:56 +0100 Subject: [PATCH 3/7] reenable fontfile --- libvips/create/text.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvips/create/text.c b/libvips/create/text.c index 71dd9786..26c4d177 100644 --- a/libvips/create/text.c +++ b/libvips/create/text.c @@ -84,6 +84,7 @@ #include #include #include +#include #include "pcreate.h" @@ -371,7 +372,6 @@ vips_text_build( VipsObject *object ) text->context = pango_font_map_create_context( PANGO_FONT_MAP( vips_text_fontmap ) ); - /* if( text->fontfile && !g_hash_table_lookup( vips_text_fontfiles, text->fontfile ) ) { if( !FcConfigAppFontAddFile( NULL, @@ -386,7 +386,6 @@ vips_text_build( VipsObject *object ) text->fontfile, g_strdup( text->fontfile ) ); } - */ /* If our caller set height and not dpi, we adjust dpi until * we get a fit. From b4fe2c7b8b01994e0a59479bbc8d65f88166192e Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Apr 2021 16:52:14 +0100 Subject: [PATCH 4/7] Note pagocairo dep in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c512df1..45c05f9e 100644 --- a/README.md +++ b/README.md @@ -243,10 +243,10 @@ If you are going to be using libvips with untrusted images, perhaps in a web server, for example, you should consider the security implications of enabling a package with such a large attack surface. -### pangoft2 +### pangocairo If available, libvips adds support for text rendering. You need the -package pangoft2 in `pkg-config --list-all`. +package pangocairo in `pkg-config --list-all`. ### orc-0.4 From b27a10c54727d080e8d51f8d70e7b9c4701689eb Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Apr 2021 16:55:01 +0100 Subject: [PATCH 5/7] ask brew to update/upgrade might help CI failures on macOS --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32d8c34a..67a166f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,9 @@ jobs: - name: Install macOS dependencies if: contains(matrix.os, 'macos') - run: + run: | + brew update + brew upgrade brew install autoconf automake libtool gtk-doc gobject-introspection From 31fe2746266b1f2da457be778b49b8b2f0a6943f Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Apr 2021 17:29:54 +0100 Subject: [PATCH 6/7] fix mono rendering always render RGBA, then in mono mode just use the alpha --- libvips/create/text.c | 56 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/libvips/create/text.c b/libvips/create/text.c index 26c4d177..d09f5e5b 100644 --- a/libvips/create/text.c +++ b/libvips/create/text.c @@ -345,10 +345,10 @@ vips_text_build( VipsObject *object ) VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object ); VipsCreate *create = VIPS_CREATE( object ); VipsText *text = (VipsText *) object; + VipsImage **t = (VipsImage **) vips_object_local_array( object, 3 ); VipsRect extents; - int bands; - VipsInterpretation interpretation; + VipsImage *image; cairo_surface_t *surface; cairo_t *cr; @@ -407,36 +407,29 @@ vips_text_build( VipsObject *object ) return( -1 ); } - if( text->rgba ) { - interpretation = VIPS_INTERPRETATION_sRGB; - bands = 4; - } - else { - interpretation = VIPS_INTERPRETATION_MULTIBAND; - bands = 1; - } - /* Set DPI as pixels/mm. */ - vips_image_init_fields( create->out, - extents.width, extents.height, bands, + image = t[0] = vips_image_new_memory(); + vips_image_init_fields( image, + extents.width, extents.height, 4, VIPS_FORMAT_UCHAR, VIPS_CODING_NONE, - interpretation, text->dpi / 25.4, text->dpi / 25.4 ); + VIPS_INTERPRETATION_sRGB, + text->dpi / 25.4, text->dpi / 25.4 ); - vips_image_pipelinev( create->out, VIPS_DEMAND_STYLE_ANY, NULL ); - create->out->Xoffset = extents.left; - create->out->Yoffset = extents.top; + vips_image_pipelinev( image, VIPS_DEMAND_STYLE_ANY, NULL ); + image->Xoffset = extents.left; + image->Yoffset = extents.top; - if( vips_image_write_prepare( create->out ) ) { + if( vips_image_write_prepare( image ) ) { g_mutex_unlock( vips_text_lock ); return( -1 ); } surface = cairo_image_surface_create_for_data( - VIPS_IMAGE_ADDR( create->out, 0, 0 ), - text->rgba ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_A8, - create->out->Xsize, create->out->Ysize, - VIPS_IMAGE_SIZEOF_LINE( create->out ) ); + VIPS_IMAGE_ADDR( image, 0, 0 ), + CAIRO_FORMAT_ARGB32, + image->Xsize, image->Ysize, + VIPS_IMAGE_SIZEOF_LINE( image ) ); cr = cairo_create( surface ); cairo_surface_destroy( surface ); @@ -454,12 +447,25 @@ vips_text_build( VipsObject *object ) /* Cairo makes pre-multipled BRGA -- we must byteswap and * unpremultiply. */ - for( y = 0; y < create->out->Ysize; y++ ) + for( y = 0; y < image->Ysize; y++ ) vips__premultiplied_bgra2rgba( (guint32 *) - VIPS_IMAGE_ADDR( create->out, 0, y ), - create->out->Xsize ); + VIPS_IMAGE_ADDR( image, 0, y ), + image->Xsize ); } + else { + /* We just want the alpha channel. + */ + if( vips_extract_band( image, &t[1], 3, NULL ) || + vips_copy( t[1], &t[2], + "interpretation", VIPS_INTERPRETATION_MULTIBAND, + NULL ) ) + return( -1 ); + image = t[2]; + } + + if( vips_image_write( image, create->out ) ) + return( -1 ); return( 0 ); } From cc04449dc5d455964809c16d5df088568728eaa0 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Apr 2021 20:40:00 +0100 Subject: [PATCH 7/7] remove extraeous "brew upgrade" --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67a166f7..c038210e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,6 @@ jobs: if: contains(matrix.os, 'macos') run: | brew update - brew upgrade brew install autoconf automake libtool gtk-doc gobject-introspection