From 271ad961164ddacc9db6ed49867b8a034bbbd370 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 4 Nov 2009 14:26:18 +0000
Subject: [PATCH] stuff

---
 doc/reference/libvips-docs.sgml.in |  2 +-
 libvips/format/format.c            |  5 +++--
 libvips/include/vips/deprecated.h  |  2 ++
 libvips/include/vips/format.h      | 32 +++++++++++++++---------------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/doc/reference/libvips-docs.sgml.in b/doc/reference/libvips-docs.sgml.in
index 003d9694..10785f23 100644
--- a/doc/reference/libvips-docs.sgml.in
+++ b/doc/reference/libvips-docs.sgml.in
@@ -42,6 +42,7 @@
     <title>VIPS operation API by section (no gtkdoc comments yet)</title>
     <xi:include href="xml/conversion.xml"/>
     <xi:include href="xml/convolution.xml"/>
+    <xi:include href="xml/format.xml"/>
     <xi:include href="xml/morphology.xml"/>
     <xi:include href="xml/resample.xml"/>
     <xi:include href="xml/histograms_lut.xml"/>
@@ -56,7 +57,6 @@
 
   <chapter>
     <title>Other API (no gtkdoc comments yet)</title>
-    <xi:include href="xml/format.xml"/>
     <xi:include href="xml/interpolate.xml"/>
     <xi:include href="xml/object.xml"/>
     <xi:include href="xml/transform.xml"/>
diff --git a/libvips/format/format.c b/libvips/format/format.c
index e35c8144..0d9e78b4 100644
--- a/libvips/format/format.c
+++ b/libvips/format/format.c
@@ -42,13 +42,14 @@
 #endif /*WITH_DMALLOC*/
 
 /**
- * SECTION: VipsFormat
+ * SECTION: format
  * @short_description: load and save in a variety of formats
  * @stability: Stable
  * @see_also: <link linkend="libvips-image">image</link>
  * @include: vips/vips.h
  *
- * VIPS has a simple system for representing image loader
+ * VIPS has a simple system for representing image load ans save operations in
+ * a generic way.
  *
  */
 
diff --git a/libvips/include/vips/deprecated.h b/libvips/include/vips/deprecated.h
index bf1b4e37..6c400f23 100644
--- a/libvips/include/vips/deprecated.h
+++ b/libvips/include/vips/deprecated.h
@@ -345,6 +345,8 @@ int im_print( const char *message );
 
 int im_convsub( IMAGE *in, IMAGE *out, INTMASK *mask, int xskip, int yskip );
 
+int im_bernd( const char *tiffname, int x, int y, int w, int h );
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/
diff --git a/libvips/include/vips/format.h b/libvips/include/vips/format.h
index d6e06fc7..5f7f1360 100644
--- a/libvips/include/vips/format.h
+++ b/libvips/include/vips/format.h
@@ -114,26 +114,26 @@ VipsFormatFlags vips_format_get_flags( VipsFormatClass *format,
 
 /* Read/write an image convenience functions.
  */
-int vips_format_read( const char *name, IMAGE *out );
-int vips_format_write( IMAGE *im, const char *name );
+int vips_format_read( const char *filename, IMAGE *out );
+int vips_format_write( IMAGE *in, const char *filename );
 
-int im_jpeg2vips( const char *in, IMAGE * );
-int im_vips2jpeg( IMAGE *in, const char * );
-int im_vips2mimejpeg( IMAGE *in, int );
-int im_vips2bufjpeg( IMAGE *in, IMAGE *, int, char **, int * );
-int im_vips2tiff( IMAGE *in, const char * );
-int im_bernd( const char *in, int, int, int, int );
-int im_tiff2vips( const char *in, IMAGE * );
-int im_tile_cache( IMAGE *in, IMAGE *, int, int, int );
-int im_magick2vips( const char *in, IMAGE * );
-int im_png2vips( const char *in, IMAGE * );
-int im_exr2vips( const char *in, IMAGE * );
-int im_ppm2vips( const char *in, IMAGE * );
-int im_vips2ppm( IMAGE *in, const char * );
+int im_jpeg2vips( const char *filename, IMAGE *out );
+int im_vips2jpeg( IMAGE *in, const char *filename );
+int im_vips2mimejpeg( IMAGE *in, int qfac );
+int im_vips2bufjpeg( IMAGE *in, IMAGE *out, int qfac, char **obuf, int *olen );
+int im_vips2tiff( IMAGE *in, const char *filename );
+int im_tiff2vips( const char *filename, IMAGE *out );
+int im_tile_cache( IMAGE *in, IMAGE *out, 
+	int tile_width, int tile_height, int max_tiles );
+int im_magick2vips( const char *filename, IMAGE * );
+int im_png2vips( const char *filename, IMAGE *out );
+int im_exr2vips( const char *filename, IMAGE *out );
+int im_ppm2vips( const char *filename, IMAGE *out );
+int im_vips2ppm( IMAGE *in, const char *filename );
 int im_analyze2vips( const char *filename, IMAGE *out );
 int im_vips2csv( IMAGE *in, const char *filename );
 int im_csv2vips( const char *filename, IMAGE *out );
-int im_vips2png( IMAGE *, const char * );
+int im_vips2png( IMAGE *in, const char *filename );
 int im_raw2vips( const char *filename, IMAGE *out,
 	int width, int height, int bpp, int offset );
 int im_vips2raw( IMAGE *in, int fd );