From ba6f8044af6e15e08644fcf4424cd9ba4ae8143b Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 18 Dec 2014 17:20:59 +0000 Subject: [PATCH] final doc fixups and update cplusplus binding --- cplusplus/include/vips/vips-operators.h | 6 +++--- cplusplus/vips-operators.cpp | 11 +++++------ doc/reference/libvips-docs.xml.in | 2 +- libvips/foreign/foreign.c | 10 ++++++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/cplusplus/include/vips/vips-operators.h b/cplusplus/include/vips/vips-operators.h index 8d5b6b0f..b1e9538a 100644 --- a/cplusplus/include/vips/vips-operators.h +++ b/cplusplus/include/vips/vips-operators.h @@ -1,5 +1,5 @@ // headers for vips operations -// Sun Nov 16 12:18:15 GMT 2014 +// Thu Dec 18 11:24:18 GMT 2014 // this file is generated automatically, do not edit! static void system( char * cmd_format , VOption *options = 0 ) @@ -276,7 +276,7 @@ VImage affine( std::vector matrix , VOption *options = 0 ) throw( VError ); VImage similarity( VOption *options = 0 ) throw( VError ); -VImage resize( double h_scale , double v_scale , VOption *options = 0 ) +VImage resize( double scale , VOption *options = 0 ) throw( VError ); VImage colourspace( VipsInterpretation space , VOption *options = 0 ) throw( VError ); @@ -366,7 +366,7 @@ VImage spcor( VImage ref , VOption *options = 0 ) throw( VError ); VImage sharpen( VOption *options = 0 ) throw( VError ); -VImage gaussblur( int radius , VOption *options = 0 ) +VImage gaussblur( double sigma , VOption *options = 0 ) throw( VError ); VImage fwfft( VOption *options = 0 ) throw( VError ); diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index 46f2750b..42dddf9e 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,5 +1,5 @@ // bodies for vips operations -// Sun Nov 16 12:18:23 GMT 2014 +// Thu Dec 18 11:24:06 GMT 2014 // this file is generated automatically, do not edit! void VImage::system( char * cmd_format , VOption *options ) @@ -1834,7 +1834,7 @@ VImage VImage::similarity( VOption *options ) return( out ); } -VImage VImage::resize( double h_scale , double v_scale , VOption *options ) +VImage VImage::resize( double scale , VOption *options ) throw( VError ) { VImage out; @@ -1843,8 +1843,7 @@ VImage VImage::resize( double h_scale , double v_scale , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "h-scale", h_scale ) -> - set( "v-scale", v_scale ) ); + set( "scale", scale ) ); return( out ); } @@ -2438,7 +2437,7 @@ VImage VImage::sharpen( VOption *options ) return( out ); } -VImage VImage::gaussblur( int radius , VOption *options ) +VImage VImage::gaussblur( double sigma , VOption *options ) throw( VError ) { VImage out; @@ -2447,7 +2446,7 @@ VImage VImage::gaussblur( int radius , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "radius", radius ) ); + set( "sigma", sigma ) ); return( out ); } diff --git a/doc/reference/libvips-docs.xml.in b/doc/reference/libvips-docs.xml.in index df159327..1167bc53 100644 --- a/doc/reference/libvips-docs.xml.in +++ b/doc/reference/libvips-docs.xml.in @@ -12,7 +12,7 @@ For VIPS @VIPS_VERSION@. The latest version of this documentation can be found on the VIPS website. + url="http://www.vips.ecs.soton.ac.uk/index.php?title=Documentation">VIPS website. diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c index 322b30d5..93606531 100644 --- a/libvips/foreign/foreign.c +++ b/libvips/foreign/foreign.c @@ -1630,8 +1630,8 @@ vips_foreign_operation_init( void ) * * Optional arguments: * - * @all_frames: load all frames in sequence - * @density: canvas resolution for rendering vector formats like SVG + * @all_frames: %gboolean, load all frames in sequence + * @density: string, canvas resolution for rendering vector formats like SVG * * Read in an image using libMagick, the ImageMagick library. This library can * read more than 80 file formats, including SVG, BMP, EPS, DICOM and many @@ -1647,7 +1647,9 @@ vips_foreign_operation_init( void ) * as a GIF). Set @all_frames to true to read the whole image sequence. * * @density is "WxH" in DPI, e.g. "600x300" or "600" (default is "72x72"). See - * http://www.imagemagick.org/script/command-line-options.php#density + * the [density + * docs](http://www.imagemagick.org/script/command-line-options.php#density) + * on the imagemagick website. * * See also: vips_image_new_from_file(). * @@ -1674,7 +1676,7 @@ vips_magickload( const char *filename, VipsImage **out, ... ) * * Optional arguments: * - * @page: load this page + * @page: int, load this page * * Read a TIFF file into a VIPS image. It is a full baseline TIFF 6 reader, * with extensions for tiled images, multipage images, LAB colour space,