From 5c88d473a9a0d094a92a3863aaacc9bd5ce7bcdc Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 3 Nov 2009 22:00:09 +0000
Subject: [PATCH] stuff

---
 doc/reference/libvips-docs.sgml.in |  2 +-
 libvips/include/vips/conversion.h  | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/reference/libvips-docs.sgml.in b/doc/reference/libvips-docs.sgml.in
index 2e08d140..003d9694 100644
--- a/doc/reference/libvips-docs.sgml.in
+++ b/doc/reference/libvips-docs.sgml.in
@@ -8,7 +8,7 @@
   <bookinfo>
     <title>VIPS Reference Manual</title>
     <releaseinfo>
-      for VIPS @IM_VERSION@
+      For VIPS @IM_VERSION@.
       The latest version of this documentation can be found on the 
       <ulink role="online-location"
 	      url="http://http://www.vips.ecs.soton.ac.uk/index.php?title=Documentation">VIPS website</ulink>.
diff --git a/libvips/include/vips/conversion.h b/libvips/include/vips/conversion.h
index 093d28ca..ba703318 100644
--- a/libvips/include/vips/conversion.h
+++ b/libvips/include/vips/conversion.h
@@ -61,20 +61,6 @@ int im_copy_swap( IMAGE *in, IMAGE *out );
 int im_copy_from( IMAGE *in, IMAGE *out, im_arch_type architecture );
 int im_copy_file( IMAGE *in, IMAGE *out );
 
-int im_extract_band( IMAGE *in, IMAGE *out, int band );
-int im_extract_bands( IMAGE *in, IMAGE *out, int band, int nbands );
-int im_extract_area( IMAGE *in, IMAGE *out, int x, int y, int w, int h );
-int im_extract_areabands( IMAGE *in, IMAGE *out,
-	int left, int top, int width, int height, int band, int nbands );
-int im_embed( IMAGE *in, IMAGE *out, int type, 
-	int left, int top, int width, int height );
-
-int im_subsample( IMAGE *in, IMAGE *out, int x, int y );
-int im_zoom( IMAGE *in, IMAGE *out, int x, int y );
-
-int im_bandjoin( IMAGE *in, IMAGE *out, IMAGE * );
-int im_gbandjoin( IMAGE **in, IMAGE *out, int );
-
 int im_black( IMAGE *out, int, int, int );
 int im_text( IMAGE *out, const char *text, const char *font,
 	int width, int alignment, int dpi );
@@ -97,6 +83,17 @@ int im_falsecolour( IMAGE *in, IMAGE *out );
 
 int im_recomb( IMAGE *in, IMAGE *out, DOUBLEMASK *recomb );
 
+int im_extract_band( IMAGE *in, IMAGE *out, int band );
+int im_extract_bands( IMAGE *in, IMAGE *out, int band, int nbands );
+int im_extract_area( IMAGE *in, IMAGE *out, int x, int y, int w, int h );
+int im_extract_areabands( IMAGE *in, IMAGE *out,
+	int left, int top, int width, int height, int band, int nbands );
+int im_embed( IMAGE *in, IMAGE *out, int type, 
+	int left, int top, int width, int height );
+
+int im_bandjoin( IMAGE *in, IMAGE *out, IMAGE * );
+int im_gbandjoin( IMAGE **in, IMAGE *out, int );
+
 int im_insert( IMAGE *in, IMAGE *out, IMAGE *, int x, int y );
 int im_insert_noexpand( IMAGE *in, IMAGE *out, IMAGE *, int x, int y );
 int im_lrjoin( IMAGE *in1, IMAGE *in2, IMAGE *out );
@@ -111,6 +108,9 @@ int im_rot90( IMAGE *in, IMAGE *out );
 int im_rot180( IMAGE *in, IMAGE *out );
 int im_rot270( IMAGE *in, IMAGE *out );
 
+int im_subsample( IMAGE *in, IMAGE *out, int x, int y );
+int im_zoom( IMAGE *in, IMAGE *out, int x, int y );
+
 int im_system( IMAGE *im, const char *cmd, char **out );
 
 #ifdef __cplusplus