added timeout on image GC

ChangeLog

@@ -31,6 +31,7 @@
 - added invalidate callbacks
 - now tests for MagickWand before ImageMagick (thanks Adam) 
 - added "-rotate" option to vips2dj
+- added man page for im_resize_linear
 
 25/1/08 started 7.14.0
 - bump all version numbers for new stable

man/Makefile.am

@@ -450,6 +450,7 @@ man_MANS = \
 	im_render.3 \
 	im_render_fade.3 \
 	im_replicate.3 \
+	im_resize_linear.3 \
 	im_ri2c.3 \
 	im_rightshift_size.3 \
 	im_rint.3 \

man/im_conv.3

@@ -2,7 +2,7 @@
 .SH NAME
 im_conv, im_conv_raw, im_convf, im_convf_raw, 
 im_convsep, im_convsep_raw, im_convsepf, im_convsepf_raw,
-im_convsub, im_shrink \-  convolves an image with a generalised mask
+im_convsub \-  convolves an image with a generalised mask
 .SH SYNOPSIS
 #include <vips/vips.h>
 
@@ -136,12 +136,6 @@ During the covolution, values are rounded before division.
 Both input and output are bytes.  Output is clipped between 0 and 255.
 The function expects an integer mask.
 
-.B im_shrink(3)
-shrink the input image file by xfactor along the horizontal and
-yfactor along the vertical direction.  The function does not perform subpixel
-interpolation and therefore the resultant image can present aliasing especially
-for small x and y factors. Any size image, any non-complex type, any number of
-bands.
 .SH RETURN VALUE
 The functions returns 0 on success and -1 on error.
 .SH SEE ALSO

man/im_resize_linear.3

@@ -0,0 +1 @@
+.so man3/im_shrink.3

man/im_shrink.3

@@ -1 +1,45 @@
-.so man3/im_conv.3
+.TH SHRINK 3 "2 May 1991"
+.SH NAME
+im_shrink \-  shrink an image
+.SH SYNOPSIS
+#include <vips/vips.h>
+
+int im_shrink(in, out, xfactor, yfactor)
+.br
+IMAGE *in, *out;
+.br
+double xfactor, yfactor;
+
+int im_resize_linear(in, out, X, Y)
+.br
+IMAGE *in, *out;
+.br
+int X, Y;
+
+.SH DESCRIPTION
+
+.B im_shrink(3)
+shrink the input image file by 
+.B xfactor 
+along the horizontal and
+.B yfactor 
+along the vertical direction.  The function does not perform subpixel
+interpolation and therefore the resultant image can present aliasing especially
+for small x and y factors. Any size image, any non-complex type, any number of
+bands.
+
+.B im_resize_linear(3)
+resizes the image to be
+.B X
+by
+.B Y
+pixels. It is slow, only does bilinear interpolation (and so will be
+inaccurate for factors greater than two), and uses WIO, so it has a 2GB image
+size limit and will use large amounts of memory. Use 
+.B im_shrink(3)
+in preference if possible.
+
+.SH RETURN VALUE
+The functions returns 0 on success and -1 on error.
+.SH SEE ALSO
+im_affine(3)