Merge branch '8.8'

ChangeLog

@@ -20,6 +20,8 @@
 - add iiif layout to dzsave
 - fix use of resolution-unit metadata on tiff save [kayarre]
 
+17/9/19 started 8.8.4
+
 31/8/19 started 8.8.3
 - revert sharpen restoring the input colourspace
 - xres/yres tiffsave params were in pixels/cm [f--f]

configure.ac

@@ -1336,6 +1336,7 @@ AC_OUTPUT([
 	libvips/Makefile 
 	libvips/arithmetic/Makefile 
 	libvips/colour/Makefile 
+	libvips/colour/profiles/Makefile 
 	libvips/conversion/Makefile 
 	libvips/convolution/Makefile 
 	libvips/deprecated/Makefile 

libvips/colour/Makefile.am

@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libcolour.la
 
+SUBDIRS = profiles
+
 libcolour_la_SOURCES = \
 	profiles.c \
 	profiles.h \
@@ -42,7 +44,6 @@ profiles.c:
 	./wrap-profiles.sh profiles profiles.c
 
 EXTRA_DIST = \
-	profiles \
 	wrap-profiles.sh
 
 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 

libvips/colour/profiles/Makefile.am

@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	cmyk.icm \
+	sRGB.icm

test/test_formats.sh

@@ -12,10 +12,6 @@ set -e
 poppler=$test_images/blankpage.pdf
 poppler_ref=$test_images/blankpage.pdf.png
 
-# rsvg / svgload reference image
-rsvg=$test_images/blankpage.svg
-rsvg_ref=$test_images/blankpage.svg.png
-
 # giflib / gifload reference image
 giflib=$test_images/trans-x.gif
 giflib_ref=$test_images/trans-x.png
@@ -220,10 +216,7 @@ if test_supported pdfload; then
 	test_loader $poppler_ref $poppler pdfload 0
 fi
 
-if test_supported svgload; then
-	# librsvg can give small differences on some platforms
-	test_loader $rsvg_ref $rsvg svgload 10
-fi
+# don't test SVG --- the output varies too much between librsvg versions
 
 if test_supported gifload; then
 	test_loader $giflib_ref $giflib gifload 0