add unicode tiff open on windows

also fix make dist,

ChangeLog

@@ -37,6 +37,7 @@
 - support --strip for pngsave
 - add svgz support [Felix Bünemann]
 - rename boostrap.sh -> autogen.sh to help snapcraft
+- support unicode filenames on Windows 
 
 30/7/16 started 8.3.3
 - fix performance regression in 8.3.2, thanks Lovell

Makefile.am

@@ -32,12 +32,11 @@ SUBDIRS = \
 EXTRA_DIST = \
 	m4 \
 	benchmark \
-	bootstrap.sh \
+	autogen.sh \
 	vips.pc.in \
 	vipsCC.pc.in \
 	vips-cpp.pc.in \
 	libvips.supp \
-	acinclude.m4 \
 	depcomp \
 	README.md \
 	$(P_DIST_DIR) \

libvips/foreign/tiff2vips.c

@@ -1858,6 +1858,10 @@ readtiff_new( VipsImage *out,
 	return( rtiff );
 }
 
+/* Can't declare this in tiff.h, we need that to be TIFF-free.
+ */
+TIFF *vips__tiff_openin( const char *name );
+
 static ReadTiff *
 readtiff_new_filename( const char *filename, VipsImage *out, 
 	int page, gboolean autorotate, gboolean readbehind )
@@ -1873,7 +1877,7 @@ readtiff_new_filename( const char *filename, VipsImage *out,
 	/* No mmap --- no performance advantage with libtiff, and it burns up
 	 * our VM if the tiff file is large.
 	 */
-	if( !(rtiff->tiff = TIFFOpen( filename, "rm" )) ) {
+	if( !(rtiff->tiff = vips__tiff_openin( filename )) ) {
 		vips_error( "tiff2vips", _( "unable to open \"%s\" for input" ),
 			filename );
 		return( NULL );
@@ -2108,7 +2112,7 @@ vips__istifftiled( const char *filename )
 
 	vips__tiff_init();
 
-	if( !(tif = TIFFOpen( filename, "rm" )) ) {
+	if( !(tif = vips__tiff_openin( filename )) ) {
 		vips_error_clear();
 		return( FALSE );
 	}

libvips/foreign/vips2tiff.c

@@ -164,6 +164,8 @@
  * 	- support strip option
  * 4/7/16
  * 	- tag alpha as UNASSALPHA since it's not pre-multiplied, thanks Peter
+ * 17/8/16
+ * 	- use wchar_t TIFFOpen on Windows
  */
 
 /*
@@ -287,19 +289,40 @@ struct _Write {
 
 /* Open TIFF for output.
  */
-static TIFF *
+TIFF *
-tiff_openout( Write *write, const char *name )
+vips__tiff_openout( const char *path, gboolean bigtiff )
 {
 	TIFF *tif;
-	const char *mode = write->bigtiff ? "w8" : "w";
+	const char *mode = bigtiff ? "w8" : "w";
 
 #ifdef DEBUG
-	printf( "TIFFOpen( \"%s\", \"%s\" )\n", name, mode );
+	printf( "vips__tiff_openout( \"%s\", \"%s\" )\n", path, mode );
 #endif /*DEBUG*/
 
-	if( !(tif = TIFFOpen( name, mode )) ) {
+	/* Need the utf-16 version on Windows.
-		vips_error( "vips2tiff", 
+	 */
-			_( "unable to open \"%s\" for output" ), name );
+#ifdef OS_WIN32
+{
+	GError *error = NULL;
+	wchar_t *path16;
+
+	if( !(path16 = (wchar_t *) 
+		g_utf8_to_utf16( path, -1, NULL, NULL, &error )) ) { 
+		vips_g_error( &error );
+		return( NULL );
+	}
+
+	tif = TIFFOpenW( path16, mode );
+
+	g_free( path16 ); 
+}
+#else /*!OS_WIN32*/
+	tif = TIFFOpen( path, mode );
+#endif /*OS_WIN32*/
+
+	if( !tif ) {
+		vips_error( "tiff", 
+			_( "unable to open \"%s\" for output" ), path );
 		return( NULL );
 	}
 
@@ -308,14 +331,44 @@ tiff_openout( Write *write, const char *name )
 
 /* Open TIFF for input.
  */
-static TIFF *
+TIFF *
-tiff_openin( const char *name )
+vips__tiff_openin( const char *path )
 {
+	/* No mmap --- no performance advantage with libtiff, and it burns up
+	 * our VM if the tiff file is large.
+	 */
+	const char *mode = "rm";
+
 	TIFF *tif;
 
-	if( !(tif = TIFFOpen( name, "r" )) ) {
+#ifdef DEBUG
-		vips_error( "vips2tiff", 
+	printf( "vips__tiff_openin( \"%s\" )\n", path ); 
-			_( "unable to open \"%s\" for input" ), name );
+#endif /*DEBUG*/
+
+	/* Need the utf-16 version on Windows.
+	 */
+#ifdef OS_WIN32
+{
+	GError *error = NULL;
+	wchar_t *path16;
+
+	if( !(path16 = (wchar_t *) 
+		g_utf8_to_utf16( path, -1, NULL, NULL, &error )) ) { 
+		vips_g_error( &error );
+		return( NULL );
+	}
+
+	tif = TIFFOpenW( path16, mode );
+
+	g_free( path16 ); 
+}
+#else /*!OS_WIN32*/
+	tif = TIFFOpen( path, mode );
+#endif /*OS_WIN32*/
+
+	if( !tif ) {
+		vips_error( "tiff", 
+			_( "unable to open \"%s\" for input" ), path );
 		return( NULL );
 	}
 
@@ -760,7 +813,8 @@ pyramid_fill( Write *write )
 		if( vips_region_buffer( layer->strip, &strip_size ) ) 
 			return( -1 );
 
-		if( !(layer->tif = tiff_openout( write, layer->lname )) ||
+		if( !(layer->tif = 
+			vips__tiff_openout( layer->lname, write->bigtiff )) ||
 			write_tiff_header( write, layer ) )  
 			return( -1 );
 	}
@@ -1599,7 +1653,7 @@ write_gather( Write *write )
 			printf( "Appending layer %s ...\n", layer->lname );
 #endif /*DEBUG*/
 
-			if( !(in = tiff_openin( layer->lname )) ) 
+			if( !(in = vips__tiff_openin( layer->lname )) ) 
 				return( -1 );
 			if( write_copy_tiff( write, write->layer->tif, in ) ) {
 				TIFFClose( in );

libvips/iofuncs/util.c

@@ -557,6 +557,7 @@ vips__open( const char *filename, int flags, ... )
 	va_end( ap );
 
 #ifdef OS_WIN32
+{
 	GError *error = NULL;
 	wchar_t *path16;
 
@@ -569,6 +570,7 @@ vips__open( const char *filename, int flags, ... )
 	fd = _wopen( path16, flags, mode );
 
 	g_free( path16 );
+}
 #else /*!OS_WIN32*/
 	fd = open( filename, flags, mode );
 #endif

po/POTFILES.in

@@ -1,276 +1,296 @@
-libvips/arithmetic/abs.c
-libvips/arithmetic/hist_find_ndim.c
-libvips/arithmetic/getpoint.c
-libvips/arithmetic/complex.c
-libvips/arithmetic/invert.c
-libvips/arithmetic/nary.c
-libvips/arithmetic/multiply.c
-libvips/arithmetic/hough.c
-libvips/arithmetic/round.c
-libvips/arithmetic/subtract.c
 libvips/arithmetic/min.c
-libvips/arithmetic/unaryconst.c
+libvips/arithmetic/sum.c
+libvips/arithmetic/stats.c
 libvips/arithmetic/project.c
-libvips/arithmetic/avg.c
+libvips/arithmetic/hough_line.c
+libvips/arithmetic/binary.c
+libvips/arithmetic/deviate.c
 libvips/arithmetic/max.c
 libvips/arithmetic/statistic.c
-libvips/arithmetic/divide.c
+libvips/arithmetic/nary.c
-libvips/arithmetic/profile.c
+libvips/arithmetic/invert.c
-libvips/arithmetic/stats.c
-libvips/arithmetic/sum.c
-libvips/arithmetic/binary.c
-libvips/arithmetic/hist_find_indexed.c
-libvips/arithmetic/deviate.c
-libvips/arithmetic/relational.c
-libvips/arithmetic/measure.c
 libvips/arithmetic/remainder.c
-libvips/arithmetic/unary.c
-libvips/arithmetic/hough_circle.c
-libvips/arithmetic/math.c
-libvips/arithmetic/hough_line.c
-libvips/arithmetic/arithmetic.c
-libvips/arithmetic/hist_find.c
-libvips/arithmetic/add.c
-libvips/arithmetic/math2.c
-libvips/arithmetic/linear.c
 libvips/arithmetic/boolean.c
 libvips/arithmetic/sign.c
-libvips/colour/scRGB2sRGB.c
+libvips/arithmetic/hist_find_ndim.c
-libvips/colour/XYZ2scRGB.c
+libvips/arithmetic/multiply.c
-libvips/colour/Lab2XYZ.c
+libvips/arithmetic/hough_circle.c
-libvips/colour/LCh2Lab.c
+libvips/arithmetic/measure.c
-libvips/colour/LCh2UCS.c
+libvips/arithmetic/hist_find.c
-libvips/colour/dE00.c
+libvips/arithmetic/getpoint.c
-libvips/colour/scRGB2BW.c
+libvips/arithmetic/add.c
-libvips/colour/scRGB2XYZ.c
+libvips/arithmetic/divide.c
-libvips/colour/icc_transform.c
+libvips/arithmetic/relational.c
-libvips/colour/dECMC.c
+libvips/arithmetic/hough.c
-libvips/colour/colour.c
+libvips/arithmetic/arithmetic.c
+libvips/arithmetic/abs.c
+libvips/arithmetic/avg.c
+libvips/arithmetic/linear.c
+libvips/arithmetic/round.c
+libvips/arithmetic/math2.c
+libvips/arithmetic/unaryconst.c
+libvips/arithmetic/complex.c
+libvips/arithmetic/profile.c
+libvips/arithmetic/unary.c
+libvips/arithmetic/subtract.c
+libvips/arithmetic/hist_find_indexed.c
+libvips/arithmetic/math.c
+libvips/colour/LabQ2LabS.c
 libvips/colour/rad2float.c
-libvips/colour/sRGB2scRGB.c
+libvips/colour/XYZ2scRGB.c
-libvips/colour/UCS2LCh.c
-libvips/colour/Lab2LabQ.c
-libvips/colour/colourspace.c
 libvips/colour/Lab2LabS.c
 libvips/colour/LabS2LabQ.c
-libvips/colour/Lab2LCh.c
-libvips/colour/Yxy2XYZ.c
-libvips/colour/LabQ2sRGB.c
 libvips/colour/float2rad.c
-libvips/colour/XYZ2Yxy.c
+libvips/colour/scRGB2XYZ.c
-libvips/colour/dE76.c
-libvips/colour/XYZ2Lab.c
-libvips/colour/LabQ2LabS.c
 libvips/colour/LabQ2Lab.c
+libvips/colour/HSV2sRGB.c
+libvips/colour/XYZ2Lab.c
+libvips/colour/UCS2LCh.c
+libvips/colour/dE76.c
+libvips/colour/colour.c
+libvips/colour/sRGB2HSV.c
+libvips/colour/Lab2LabQ.c
+libvips/colour/LCh2UCS.c
+libvips/colour/sRGB2scRGB.c
+libvips/colour/dECMC.c
+libvips/colour/LCh2Lab.c
+libvips/colour/Yxy2XYZ.c
 libvips/colour/LabS2Lab.c
-libvips/conversion/rot.c
+libvips/colour/LabQ2sRGB.c
+libvips/colour/scRGB2BW.c
+libvips/colour/Lab2LCh.c
+libvips/colour/icc_transform.c
+libvips/colour/scRGB2sRGB.c
+libvips/colour/dE00.c
+libvips/colour/Lab2XYZ.c
+libvips/colour/XYZ2Yxy.c
+libvips/colour/colourspace.c
 libvips/conversion/conversion.c
-libvips/conversion/grid.c
-libvips/conversion/recomb.c
-libvips/conversion/falsecolour.c
-libvips/conversion/flatten.c
-libvips/conversion/replicate.c
-libvips/conversion/bandary.c
-libvips/conversion/subsample.c
-libvips/conversion/cache.c
-libvips/conversion/join.c
-libvips/conversion/gamma.c
-libvips/conversion/rot45.c
-libvips/conversion/autorot.c
-libvips/conversion/extract.c
-libvips/conversion/wrap.c
-libvips/conversion/zoom.c
-libvips/conversion/bandbool.c
-libvips/conversion/ifthenelse.c
-libvips/conversion/tilecache.c
-libvips/conversion/flip.c
-libvips/conversion/bandjoin.c
-libvips/conversion/copy.c
-libvips/conversion/cast.c
-libvips/conversion/sequential.c
 libvips/conversion/embed.c
-libvips/conversion/insert.c
+libvips/conversion/zoom.c
+libvips/conversion/replicate.c
+libvips/conversion/bandfold.c
+libvips/conversion/wrap.c
+libvips/conversion/arrayjoin.c
+libvips/conversion/unpremultiply.c
+libvips/conversion/flip.c
+libvips/conversion/flatten.c
+libvips/conversion/copy.c
+libvips/conversion/bandjoin.c
+libvips/conversion/rot45.c
 libvips/conversion/msb.c
-libvips/conversion/bandrank.c
+libvips/conversion/extract.c
+libvips/conversion/cast.c
+libvips/conversion/bandunfold.c
+libvips/conversion/tilecache.c
+libvips/conversion/sequential.c
+libvips/conversion/premultiply.c
 libvips/conversion/bandmean.c
+libvips/conversion/falsecolour.c
+libvips/conversion/byteswap.c
+libvips/conversion/subsample.c
+libvips/conversion/bandbool.c
+libvips/conversion/recomb.c
+libvips/conversion/bandary.c
+libvips/conversion/ifthenelse.c
+libvips/conversion/gamma.c
+libvips/conversion/join.c
+libvips/conversion/cache.c
+libvips/conversion/grid.c
 libvips/conversion/scale.c
-libvips/convolution/im_aconv.c
+libvips/conversion/insert.c
-libvips/convolution/fastcor.c
+libvips/conversion/autorot.c
-libvips/convolution/convsep.c
+libvips/conversion/rot.c
-libvips/convolution/gaussblur.c
+libvips/conversion/bandrank.c
-libvips/convolution/im_conv.c
-libvips/convolution/correlation.c
-libvips/convolution/compass.c
-libvips/convolution/sharpen.c
 libvips/convolution/spcor.c
-libvips/convolution/im_aconvsep.c
+libvips/convolution/conva.c
-libvips/convolution/conv.c
+libvips/convolution/fastcor.c
-libvips/convolution/im_conv_f.c
+libvips/convolution/convi.c
+libvips/convolution/compass.c
 libvips/convolution/convolution.c
-libvips/create/mask.c
+libvips/convolution/convf.c
-libvips/create/zone.c
+libvips/convolution/gaussblur.c
-libvips/create/invertlut.c
+libvips/convolution/convasep.c
-libvips/create/mask_gaussian.c
+libvips/convolution/convsep.c
-libvips/create/mask_butterworth_band.c
+libvips/convolution/sharpen.c
+libvips/convolution/conv.c
+libvips/convolution/correlation.c
 libvips/create/sines.c
-libvips/create/black.c
-libvips/create/mask_ideal_ring.c
-libvips/create/gaussnoise.c
-libvips/create/logmat.c
-libvips/create/tonelut.c
-libvips/create/mask_gaussian_band.c
-libvips/create/mask_ideal.c
-libvips/create/mask_butterworth_ring.c
-libvips/create/create.c
-libvips/create/identity.c
-libvips/create/eye.c
-libvips/create/text.c
-libvips/create/gaussmat.c
-libvips/create/xyz.c
-libvips/create/mask_butterworth.c
-libvips/create/mask_gaussian_ring.c
-libvips/create/mask_fractal.c
-libvips/create/point.c
-libvips/create/mask_ideal_band.c
 libvips/create/grey.c
+libvips/create/mask_ideal.c
+libvips/create/create.c
+libvips/create/mask_gaussian.c
+libvips/create/xyz.c
+libvips/create/invertlut.c
+libvips/create/mask_butterworth_ring.c
+libvips/create/logmat.c
+libvips/create/gaussmat.c
+libvips/create/worley.c
+libvips/create/mask_gaussian_ring.c
+libvips/create/gaussnoise.c
+libvips/create/zone.c
+libvips/create/tonelut.c
+libvips/create/perlin.c
+libvips/create/point.c
+libvips/create/mask.c
+libvips/create/mask_butterworth_band.c
+libvips/create/mask_ideal_ring.c
+libvips/create/mask_butterworth.c
+libvips/create/mask_gaussian_band.c
 libvips/create/fractsurf.c
+libvips/create/identity.c
+libvips/create/text.c
+libvips/create/mask_fractal.c
+libvips/create/eye.c
+libvips/create/black.c
+libvips/create/mask_ideal_band.c
 libvips/create/buildlut.c
-libvips/draw/draw_smudge.c
 libvips/draw/draw_line.c
 libvips/draw/draw_image.c
-libvips/draw/draw_circle.c
-libvips/draw/drawink.c
-libvips/draw/draw_flood.c
-libvips/draw/draw.c
-libvips/draw/draw_rect.c
 libvips/draw/draw_mask.c
+libvips/draw/draw.c
+libvips/draw/draw_smudge.c
+libvips/draw/drawink.c
+libvips/draw/draw_circle.c
+libvips/draw/draw_flood.c
+libvips/draw/draw_rect.c
 libvips/dummy.c
-libvips/foreign/jpeg2vips.c
+libvips/foreign/foreign.c
-libvips/foreign/radiance.c
+libvips/foreign/ppm.c
+libvips/foreign/csvsave.c
+libvips/foreign/webp2vips.c
+libvips/foreign/pngload.c
+libvips/foreign/matlab.c
+libvips/foreign/webpload.c
+libvips/foreign/pngsave.c
+libvips/foreign/tiff2vips.c
+libvips/foreign/fitsload.c
+libvips/foreign/matrixsave.c
+libvips/foreign/vips2webp.c
+libvips/foreign/ppmsave.c
+libvips/foreign/csv.c
+libvips/foreign/csvload.c
+libvips/foreign/vipspng.c
 libvips/foreign/vips2jpeg.c
+libvips/foreign/ppmload.c
+libvips/foreign/magickload.c
+libvips/foreign/openexr2vips.c
+libvips/foreign/gifload.c
+libvips/foreign/magick7load.c
+libvips/foreign/openslide2vips.c
+libvips/foreign/fitssave.c
+libvips/foreign/pdfload.c
+libvips/foreign/magick2vips.c
+libvips/foreign/fits.c
+libvips/foreign/cairo.c
+libvips/foreign/openslideload.c
+libvips/foreign/rawload.c
+libvips/foreign/jpeg2vips.c
+libvips/foreign/tiffsave.c
+libvips/foreign/svgload.c
+libvips/foreign/radsave.c
+libvips/foreign/dzsave.c
+libvips/foreign/radload.c
 libvips/foreign/openexrload.c
 libvips/foreign/vipssave.c
-libvips/foreign/rawsave.c
-libvips/foreign/csvsave.c
-libvips/foreign/matrixload.c
-libvips/foreign/radsave.c
-libvips/foreign/rawload.c
 libvips/foreign/webpsave.c
-libvips/foreign/vips2tiff.c
+libvips/foreign/radiance.c
-libvips/foreign/vips2webp.c
+libvips/foreign/rawsave.c
-libvips/foreign/fits.c
-libvips/foreign/matlab.c
-libvips/foreign/csvload.c
-libvips/foreign/jpegload.c
-libvips/foreign/magickload.c
-libvips/foreign/webpload.c
-libvips/foreign/matload.c
-libvips/foreign/tiff2vips.c
-libvips/foreign/openexr2vips.c
-libvips/foreign/foreign.c
-libvips/foreign/webp2vips.c
 libvips/foreign/jpegsave.c
-libvips/foreign/dzsave.c
-libvips/foreign/openslide2vips.c
 libvips/foreign/analyze2vips.c
-libvips/foreign/ppmsave.c
+libvips/foreign/matrixload.c
-libvips/foreign/tiffsave.c
+libvips/foreign/jpegload.c
-libvips/foreign/matrixsave.c
-libvips/foreign/fitssave.c
-libvips/foreign/csv.c
-libvips/foreign/pngload.c
-libvips/foreign/fitsload.c
-libvips/foreign/vipsload.c
-libvips/foreign/vipspng.c
-libvips/foreign/tiffload.c
-libvips/foreign/magick2vips.c
 libvips/foreign/analyzeload.c
-libvips/foreign/ppm.c
+libvips/foreign/vips2tiff.c
-libvips/foreign/openslideload.c
+libvips/foreign/matload.c
-libvips/foreign/pngsave.c
+libvips/foreign/vipsload.c
-libvips/foreign/radload.c
+libvips/foreign/tiffload.c
-libvips/foreign/ppmload.c
+libvips/freqfilt/spectrum.c
 libvips/freqfilt/phasecor.c
 libvips/freqfilt/fwfft.c
 libvips/freqfilt/freqmult.c
 libvips/freqfilt/freqfilt.c
 libvips/freqfilt/invfft.c
-libvips/freqfilt/spectrum.c
-libvips/histogram/hist_cum.c
-libvips/histogram/hist_norm.c
-libvips/histogram/hist_equal.c
-libvips/histogram/maplut.c
-libvips/histogram/hist_plot.c
-libvips/histogram/stdif.c
-libvips/histogram/hist_local.c
-libvips/histogram/histogram.c
 libvips/histogram/hist_match.c
-libvips/histogram/hist_unary.c
+libvips/histogram/hist_cum.c
+libvips/histogram/hist_equal.c
+libvips/histogram/stdif.c
+libvips/histogram/histogram.c
+libvips/histogram/hist_entropy.c
 libvips/histogram/hist_ismonotonic.c
+libvips/histogram/hist_norm.c
+libvips/histogram/hist_plot.c
+libvips/histogram/hist_unary.c
+libvips/histogram/hist_local.c
 libvips/histogram/percent.c
+libvips/histogram/maplut.c
 libvips/introspect.c
-libvips/iofuncs/gate.c
-libvips/iofuncs/window.c
-libvips/iofuncs/base64.c
-libvips/iofuncs/type.c
-libvips/iofuncs/memory.c
-libvips/iofuncs/vips.c
-libvips/iofuncs/init.c
-libvips/iofuncs/enumtypes.c
-libvips/iofuncs/cache.c
-libvips/iofuncs/buffer.c
-libvips/iofuncs/sinkmemory.c
-libvips/iofuncs/rect.c
-libvips/iofuncs/buf.c
-libvips/iofuncs/system.c
-libvips/iofuncs/threadpool.c
-libvips/iofuncs/operation.c
-libvips/iofuncs/header.c
-libvips/iofuncs/vector.c
-libvips/iofuncs/semaphore.c
-libvips/iofuncs/error.c
-libvips/iofuncs/sinkdisc.c
 libvips/iofuncs/sink.c
-libvips/iofuncs/generate.c
+libvips/iofuncs/gate.c
-libvips/iofuncs/region.c
+libvips/iofuncs/type.c
-libvips/iofuncs/mapfile.c
 libvips/iofuncs/image.c
+libvips/iofuncs/threadpool.c
+libvips/iofuncs/buffer.c
+libvips/iofuncs/mapfile.c
+libvips/iofuncs/enumtypes.c
+libvips/iofuncs/sinkdisc.c
+libvips/iofuncs/vector.c
+libvips/iofuncs/operation.c
+libvips/iofuncs/sinkmemory.c
+libvips/iofuncs/generate.c
+libvips/iofuncs/window.c
+libvips/iofuncs/system.c
+libvips/iofuncs/header.c
+libvips/iofuncs/init.c
+libvips/iofuncs/rect.c
+libvips/iofuncs/region.c
+libvips/iofuncs/cache.c
+libvips/iofuncs/vips.c
+libvips/iofuncs/error.c
 libvips/iofuncs/util.c
+libvips/iofuncs/semaphore.c
+libvips/iofuncs/memory.c
 libvips/iofuncs/sinkscreen.c
-libvips/iofuncs/vipsmarshal.c
 libvips/iofuncs/object.c
+libvips/iofuncs/buf.c
+libvips/iofuncs/vipsmarshal.c
+libvips/iofuncs/base64.c
+libvips/morphology/morph.c
+libvips/morphology/rank.c
 libvips/morphology/countlines.c
 libvips/morphology/labelregions.c
-libvips/morphology/rank.c
-libvips/morphology/hitmiss.c
 libvips/morphology/morphology.c
-libvips/morphology/morph.c
+libvips/morphology/hitmiss.c
-libvips/mosaicing/im_tbmosaic.c
-libvips/mosaicing/im_avgdxdy.c
-libvips/mosaicing/im_tbcalcon.c
 libvips/mosaicing/im_tbmerge.c
-libvips/mosaicing/im_lrcalcon.c
-libvips/mosaicing/im_clinear.c
-libvips/mosaicing/im_remosaic.c
-libvips/mosaicing/im_chkpair.c
-libvips/mosaicing/im_initialize.c
-libvips/mosaicing/merge.c
-libvips/mosaicing/mosaicing.c
-libvips/mosaicing/mosaic1.c
-libvips/mosaicing/mosaic.c
-libvips/mosaicing/im_lrmerge.c
-libvips/mosaicing/im_lrmosaic.c
 libvips/mosaicing/im_improve.c
-libvips/mosaicing/match.c
+libvips/mosaicing/im_chkpair.c
+libvips/mosaicing/im_lrmosaic.c
+libvips/mosaicing/im_tbcalcon.c
+libvips/mosaicing/merge.c
+libvips/mosaicing/im_remosaic.c
+libvips/mosaicing/im_lrcalcon.c
+libvips/mosaicing/im_initialize.c
+libvips/mosaicing/mosaicing.c
 libvips/mosaicing/global_balance.c
-libvips/resample/interpolate.c
+libvips/mosaicing/im_avgdxdy.c
-libvips/resample/resample.c
+libvips/mosaicing/im_lrmerge.c
+libvips/mosaicing/mosaic.c
+libvips/mosaicing/im_tbmosaic.c
+libvips/mosaicing/im_clinear.c
+libvips/mosaicing/match.c
+libvips/mosaicing/mosaic1.c
+libvips/resample/affine.c
+libvips/resample/shrinkv.c
+libvips/resample/mapim.c
 libvips/resample/resize.c
 libvips/resample/transform.c
-libvips/resample/similarity.c
+libvips/resample/reduce.c
-libvips/resample/shrink.c
+libvips/resample/shrinkh.c
+libvips/resample/resample.c
 libvips/resample/quadratic.c
-libvips/resample/affine.c
+libvips/resample/shrink.c
+libvips/resample/similarity.c
+libvips/resample/interpolate.c
 libvips/video/im_video_test.c
 libvips/video/video_dispatch.c
 tools/vips.c
@@ -288,107 +308,118 @@ cplusplus/include/vips/VInterpolate8.h
 cplusplus/include/vips/VError8.h
 cplusplus/include/vips/vips-operators.h
 libvips/arithmetic/unaryconst.h
+libvips/arithmetic/unary.h
 libvips/arithmetic/nary.h
 libvips/arithmetic/binary.h
-libvips/arithmetic/hough.h
 libvips/arithmetic/parithmetic.h
-libvips/arithmetic/unary.h
 libvips/arithmetic/statistic.h
-libvipsCC/include/vips/VDisplay.h
+libvips/arithmetic/hough.h
-libvipsCC/include/vips/VError.h
-libvipsCC/include/vips/VImage.h
-libvipsCC/include/vips/vipsc++.h
-libvipsCC/include/vips/vipscpp.h
 libvipsCC/include/vips/VMask.h
+libvipsCC/include/vips/VImage.h
+libvipsCC/include/vips/VError.h
+libvipsCC/include/vips/vipscpp.h
+libvipsCC/include/vips/vipsc++.h
+libvipsCC/include/vips/VDisplay.h
 libvips/colour/pcolour.h
 libvips/conversion/pconversion.h
 libvips/conversion/bandary.h
-libvips/convolution/correlation.h
 libvips/convolution/pconvolution.h
+libvips/convolution/correlation.h
+libvips/create/pmask.h
 libvips/create/point.h
 libvips/create/pcreate.h
-libvips/create/pmask.h
 libvips/draw/drawink.h
 libvips/draw/pdraw.h
-libvips/foreign/csv.h
-libvips/foreign/tiff.h
-libvips/foreign/analyze2vips.h
-libvips/foreign/jpeg.h
-libvips/foreign/fits.h
-libvips/foreign/dbh.h
-libvips/foreign/dzsave.h
-libvips/foreign/vipsjpeg.h
 libvips/foreign/openslide2vips.h
-libvips/foreign/magick.h
+libvips/foreign/dbh.h
-libvips/foreign/ppm.h
-libvips/foreign/matlab.h
-libvips/foreign/vipspng.h
-libvips/foreign/openexr2vips.h
 libvips/foreign/webp.h
+libvips/foreign/ppm.h
+libvips/foreign/vipsjpeg.h
+libvips/foreign/csv.h
+libvips/foreign/analyze2vips.h
+libvips/foreign/fits.h
+libvips/foreign/dzsave.h
+libvips/foreign/magick.h
+libvips/foreign/matlab.h
+libvips/foreign/tiff.h
+libvips/foreign/jpeg.h
 libvips/foreign/radiance.h
+libvips/foreign/openexr2vips.h
+libvips/foreign/vipspng.h
 libvips/freqfilt/pfreqfilt.h
-libvips/histogram/phistogram.h
 libvips/histogram/hist_unary.h
-libvips/include/vips/conversion.h
+libvips/histogram/phistogram.h
-libvips/include/vips/vips.h
-libvips/include/vips/private.h
-libvips/include/vips/vips7compat.h
-libvips/include/vips/debug.h
-libvips/include/vips/memory.h
 libvips/include/vips/operation.h
-libvips/include/vips/basic.h
-libvips/include/vips/image.h
-libvips/include/vips/error.h
-libvips/include/vips/internal.h
-libvips/include/vips/inlines.h
-libvips/include/vips/cimg_funcs.h
-libvips/include/vips/draw.h
-libvips/include/vips/dispatch.h
-libvips/include/vips/interpolate.h
-libvips/include/vips/intl.h
-libvips/include/vips/thread.h
-libvips/include/vips/resample.h
-libvips/include/vips/semaphore.h
-libvips/include/vips/gate.h
-libvips/include/vips/transform.h
-libvips/include/vips/util.h
-libvips/include/vips/version.h
-libvips/include/vips/morphology.h
-libvips/include/vips/generate.h
 libvips/include/vips/enumtypes.h
-libvips/include/vips/region.h
-libvips/include/vips/vector.h
-libvips/include/vips/format.h
-libvips/include/vips/threadpool.h
-libvips/include/vips/colour.h
-libvips/include/vips/freqfilt.h
-libvips/include/vips/create.h
 libvips/include/vips/video.h
-libvips/include/vips/type.h
+libvips/include/vips/internal.h
-libvips/include/vips/mosaicing.h
-libvips/include/vips/almostdeprecated.h
-libvips/include/vips/convolution.h
-libvips/include/vips/object.h
-libvips/include/vips/buf.h
-libvips/include/vips/foreign.h
-libvips/include/vips/mask.h
 libvips/include/vips/histogram.h
-libvips/include/vips/header.h
+libvips/include/vips/cimg_funcs.h
-libvips/include/vips/arithmetic.h
+libvips/include/vips/buf.h
+libvips/include/vips/thread.h
+libvips/include/vips/region.h
+libvips/include/vips/mask.h
+libvips/include/vips/private.h
+libvips/include/vips/interpolate.h
+libvips/include/vips/vips7compat.h
+libvips/include/vips/create.h
 libvips/include/vips/rect.h
-libvips/iofuncs/vipsmarshal.h
+libvips/include/vips/almostdeprecated.h
-libvips/iofuncs/base64.h
+libvips/include/vips/dispatch.h
+libvips/include/vips/version.h
+libvips/include/vips/error.h
+libvips/include/vips/debug.h
+libvips/include/vips/vips.h
+libvips/include/vips/morphology.h
+libvips/include/vips/resample.h
+libvips/include/vips/object.h
+libvips/include/vips/generate.h
+libvips/include/vips/basic.h
+libvips/include/vips/inlines.h
+libvips/include/vips/header.h
+libvips/include/vips/type.h
+libvips/include/vips/semaphore.h
+libvips/include/vips/image.h
+libvips/include/vips/vector.h
+libvips/include/vips/intl.h
+libvips/include/vips/gate.h
+libvips/include/vips/freqfilt.h
+libvips/include/vips/colour.h
+libvips/include/vips/arithmetic.h
+libvips/include/vips/threadpool.h
+libvips/include/vips/format.h
+libvips/include/vips/conversion.h
+libvips/include/vips/draw.h
+libvips/include/vips/mosaicing.h
+libvips/include/vips/deprecated.h
+libvips/include/vips/util.h
+libvips/include/vips/convolution.h
+libvips/include/vips/foreign.h
+libvips/include/vips/transform.h
+libvips/include/vips/memory.h
 libvips/iofuncs/sink.h
+libvips/iofuncs/base64.h
+libvips/iofuncs/vipsmarshal.h
 libvips/morphology/pmorphology.h
 libvips/mosaicing/pmosaicing.h
 libvips/mosaicing/global_balance.h
-libvips/resample/presample.h
 libvips/resample/templates.h
+libvips/resample/presample.h
+cplusplus/examples/avg.cpp
+cplusplus/examples/invert.cpp
+cplusplus/examples/profile.cpp
+cplusplus/examples/test_overloads.cpp
+cplusplus/examples/buffer.cpp
+cplusplus/examples/test.cpp
+cplusplus/examples/embed.cpp
+cplusplus/examples/resize.cpp
 cplusplus/VError.cpp
 cplusplus/VImage.cpp
 cplusplus/VInterpolate.cpp
 cplusplus/vips-operators.cpp
-libvips/resample/vsqbs.cpp
+libvips/resample/reduceh.cpp
 libvips/resample/bicubic.cpp
-libvips/resample/lbb.cpp
+libvips/resample/vsqbs.cpp
 libvips/resample/nohalo.cpp
+libvips/resample/lbb.cpp
+libvips/resample/reducev.cpp

po/README

@@ -20,7 +20,7 @@ and it would display as "Sevy imago os ...", with the "m" underlined.
 tips
 ----
 
-cd vips-7.x.x 
+cd vips-8.x
 find */* -name "*.c" > po/POTFILES.in
 find */* -name "*.cc" >> po/POTFILES.in
 find */* -name "*.h" >> po/POTFILES.in