sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix autofit loop on non-scaleable fonts

Browse Source 
see https://github.com/libvips/libvips/issues/1178
This commit is contained in:
John Cupitt 2018-12-07 12:57:44 +00:00
parent ac4897abee
commit da31d0f31a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
21/11/18 started 8.7.3
- fix infinite loop for autofit with non-scaleable font
21/11/18 started 8.7.2 21/11/18 started 8.7.2
- more info output for temp files to help diagnose problems - more info output for temp files to help diagnose problems
- vips_text() could set the wrong DPI - vips_text() could set the wrong DPI

6
configure.ac
View File

@ -2,7 +2,7 @@
# also update the version number in the m4 macros below # also update the version number in the m4 macros below
AC_INIT([vips], [8.7.2], [vipsip@jiscmail.ac.uk]) AC_INIT([vips], [8.7.3], [vipsip@jiscmail.ac.uk])
# required for gobject-introspection # required for gobject-introspection
AC_PREREQ(2.62) AC_PREREQ(2.62)
@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
# user-visible library versioning # user-visible library versioning
m4_define([vips_major_version], [8]) m4_define([vips_major_version], [8])
m4_define([vips_minor_version], [7]) m4_define([vips_minor_version], [7])
m4_define([vips_micro_version], [2]) m4_define([vips_micro_version], [3])
m4_define([vips_version], m4_define([vips_version],
[vips_major_version.vips_minor_version.vips_micro_version]) [vips_major_version.vips_minor_version.vips_micro_version])
@ -38,7 +38,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog`
# binary interface changes not backwards compatible?: reset age to 0 # binary interface changes not backwards compatible?: reset age to 0
LIBRARY_CURRENT=51 LIBRARY_CURRENT=51
LIBRARY_REVISION=2 LIBRARY_REVISION=3
LIBRARY_AGE=9 LIBRARY_AGE=9
# patched into include/vips/version.h # patched into include/vips/version.h

6
libvips/create/text.c
View File

@ -265,6 +265,12 @@ vips_text_autofit( VipsText *text )
previous_dpi = text->dpi; previous_dpi = text->dpi;
text->dpi = difference < 0 ? text->dpi * 2 : text->dpi / 2; text->dpi = difference < 0 ? text->dpi * 2 : text->dpi / 2;
/* This can happen with some fonts that don't resize
* gracefully.
*/
if( text->dpi < 2 )
break;
} }
if( difference < 0 ) { if( difference < 0 ) {