Merge branch '8.10'

ChangeLog

@@ -24,14 +24,14 @@
 22/12/20 start 8.10.6
 - don't seek on bad file descriptors [kleisauke]
 - check for null memory sources [kleisauke]
-- revise ppmload, fixing a couple of small bugs
-- signal error on EOF in jpegload more reliably [bozaro]
-- better error detection in spngload [randy408]
+- improve ppmload, fixing a couple of small bugs
+- improve EOF detection in jpegload [bozaro]
+- improve error detection in spngload [randy408]
 - fix includes of glib headers in C++ [lovell]
 - fix build with more modern librsvg [lovell]
 - fix a possible segv with very wide images [f1ac]
-- revise premultiply, again [jjonesrs]
-- revise profile handling in vipsthumbnail
+- fix issue thumbnailing RGBA images in linear mode [jjonesrs]
+- improve vipsthumbnail profile handling
 - fix tiff deflate predictor setting [Adios]
 
 18/12/20 started 8.10.5

doc/Makefile.am

@@ -127,7 +127,7 @@ HTML_IMAGES = \
 # we have some files in markdown ... convert to docbook for gtk-doc
 # pandoc makes section headers, we want refsect3 for gtk-doc
 .md.xml:
-	pandoc -s --template="$(realpath pandoc-docbook-template.docbook)" --wrap=none -V title="$<" -f markdown+smart -t docbook-smart -o $@ $<
+	pandoc -s --template="$(realpath pandoc-docbook-template.docbook)" --wrap=none -V title="$<" -f markdown+smart -t docbook -o $@ $<
 	sed -e s/section/refsect3/g < $@ > x && mv x $@
 
 # Our markdown source files

libvips/resample/thumbnail.c

@@ -877,13 +877,13 @@ vips_thumbnail_build( VipsObject *object )
 				thumbnail->export_profile ); 
 			if( vips_colourspace( in, &t[7], 
 				VIPS_INTERPRETATION_XYZ, NULL ) || 
-				vips_icc_export( t[7], &t[8], 
+				vips_icc_export( t[7], &t[10], 
 					"output_profile", 
 						thumbnail->export_profile,
 					"intent", thumbnail->intent,
 					NULL ) )  
 				return( -1 ); 
-			in = t[8];
+			in = t[10];
 		}
 	}
 	else if( thumbnail->linear ) {