Merge branch 'master' into revise-composite

ChangeLog

@@ -12,6 +12,9 @@
 - don't stop composite on first non-transparent image [felixbuenemann]
 - add vips_rect_overlapsrect()
 
+21/11/18 started 8.7.3
+- fix infinite loop for autofit with non-scaleable font 
+
 21/11/18 started 8.7.2
 - more info output for temp files to help diagnose problems
 - vips_text() could set the wrong DPI

configure.ac

@@ -37,9 +37,9 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog`
 #   binary interface changes backwards compatible?: increment age
 #   binary interface changes not backwards compatible?: reset age to 0
 
-LIBRARY_CURRENT=51
-LIBRARY_REVISION=1
-LIBRARY_AGE=9
+LIBRARY_CURRENT=52
+LIBRARY_REVISION=0
+LIBRARY_AGE=10
 
 # patched into include/vips/version.h
 AC_SUBST(VIPS_VERSION)

libvips/create/text.c

@@ -265,6 +265,12 @@ vips_text_autofit( VipsText *text )
 		previous_dpi = text->dpi;
 
 		text->dpi = difference < 0 ? text->dpi * 2 : text->dpi / 2;
+
+		/* This can happen with fixed-size fonts.
+		 */
+		if( text->dpi < 2 ||
+			text->dpi > 10000 )
+			break;
 	}
 
 	if( difference < 0 ) {