From 362adae8c6013122229841d9bab263c3139e7be0 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Tue, 15 Feb 2022 10:08:07 +0000 Subject: [PATCH] Revert "Enhance the introspection support by fixing annotations (#2655)" (#2656) This reverts commit 47796dcda0026fcff03e1e202b14721d3999b6b9. --- libvips/Vips-8.0.metadata | 34 ++------ libvips/colour/LabQ2sRGB.c | 26 +----- libvips/colour/XYZ2Lab.c | 6 +- libvips/colour/colourspace.c | 2 +- libvips/conversion/conversion.c | 22 ++--- libvips/conversion/switch.c | 2 +- libvips/conversion/transpose3d.c | 2 +- libvips/deprecated/im_gradcor.c | 2 + libvips/deprecated/im_linreg.c | 1 + libvips/foreign/foreign.c | 8 +- libvips/include/vips/interpolate.h | 5 -- libvips/include/vips/sbuf.h | 4 - libvips/include/vips/semaphore.h | 7 +- libvips/include/vips/threadpool.h | 9 +- libvips/include/vips/transform.h | 4 - libvips/iofuncs/header.c | 134 ++++++++++++++--------------- libvips/iofuncs/image.c | 60 ++++++------- libvips/iofuncs/object.c | 4 +- libvips/iofuncs/rect.c | 12 +-- libvips/iofuncs/region.c | 26 +++--- libvips/iofuncs/reorder.c | 2 +- libvips/iofuncs/type.c | 62 ++++++------- 22 files changed, 186 insertions(+), 248 deletions(-) diff --git a/libvips/Vips-8.0.metadata b/libvips/Vips-8.0.metadata index 0cdab554..0128948c 100644 --- a/libvips/Vips-8.0.metadata +++ b/libvips/Vips-8.0.metadata @@ -1,29 +1,7 @@ -Object.new_from_string.object_class type="GLib.ObjectClass" -Object.print_summary_class.klass type="GLib.ObjectClass" -ArgumentClass.object_class type="GLib.ObjectClass" -class_find type="GLib.ObjectClass" -ClassMapFn.cls type="GLib.ObjectClass" -ArgumentClassMapFn.object_class type="GLib.ObjectClass" +Object.new_from_string skip +Object.print_summary_class skip +ArgumentClass.object_class skip +class_find skip +ClassMapFn.cls type="void*" +ArgumentClassMapFn.object_class type="void*" ArgumentTable type="GLib.HashTable" - -Image.eval#virtual_method skip -Image.invalidate#virtual_method skip -Image.minimise#virtual_method skip -Image.posteval#virtual_method skip -Image.preeval#virtual_method skip -Image.written#virtual_method skip -Image.memory skip -Image.matrix_from_array skip - -Object.close#virtual_method skip -Object.postbuild#virtual_method skip -Object.postclose#virtual_method skip -Object.preclose#virtual_method skip -Object.preclose#method name="do_preclose" -_object_set_member name="set_member" parent="Vips.Object" symbol_type="method" instance_idx=0 - -cache_* skip=false name="cache_(.+)" parent="Vips.Cache" -col_* skip=false name="col_(.+)" parent="Vips.ColorUtils" -tracked_* skip=false name="tracked_(.+)" parent="Vips.Tracked" -check_* skip=false parent="Vips.Utils" -value_* skip=false name="value_(.+)" parent="Vips.Value" diff --git a/libvips/colour/LabQ2sRGB.c b/libvips/colour/LabQ2sRGB.c index 33de79c9..a8d9ed73 100644 --- a/libvips/colour/LabQ2sRGB.c +++ b/libvips/colour/LabQ2sRGB.c @@ -211,18 +211,7 @@ vips_col_sRGB2scRGB_16( int r, int g, int b, float *R, float *G, float *B ) */ #define SCALE (VIPS_D65_Y0) -/** - * vips_col_scRGB2XYZ: - * @R: Input scRGB value - * @G: Input scRGB value - * @B: Input scRGB value - * @X: (out): Return XYZ colour - * @Y: (out): Return XYZ colour - * @Z: (out): Return XYZ colour - * - * Turn scRGB into XYZ. - * - * See also: vips_scRGB2XYZ(). +/* scRGB to XYZ. */ int vips_col_scRGB2XYZ( float R, float G, float B, float *X, float *Y, float *Z ) @@ -234,18 +223,7 @@ vips_col_scRGB2XYZ( float R, float G, float B, float *X, float *Y, float *Z ) return( 0 ); } -/** - * vips_col_XYZ2scRGB: - * @X: Input XYZ value - * @Y: Input XYZ value - * @Z: Input XYZ value - * @R: (out): Return scRGB colour - * @G: (out): Return scRGB colour - * @B: (out): Return scRGB colour - * - * Turn XYZ into scRGB. - * - * See also: vips_XYZ2scRGB(). +/* Turn XYZ into scRGB. */ int vips_col_XYZ2scRGB( float X, float Y, float Z, float *R, float *G, float *B ) diff --git a/libvips/colour/XYZ2Lab.c b/libvips/colour/XYZ2Lab.c index bfb1b38e..4770364a 100644 --- a/libvips/colour/XYZ2Lab.c +++ b/libvips/colour/XYZ2Lab.c @@ -177,9 +177,9 @@ vips_XYZ2Lab_line( VipsColour *colour, VipsPel *out, VipsPel **in, int width ) * @X: Input CIE XYZ colour * @Y: Input CIE XYZ colour * @Z: Input CIE XYZ colour - * @L: (out): Return CIE Lab value - * @a: (out): Return CIE Lab value - * @b: (out): Return CIE Lab value + * @L: Return CIE Lab value + * @a: Return CIE Lab value + * @b: Return CIE Lab value * * Calculate XYZ from Lab, D65. * diff --git a/libvips/colour/colourspace.c b/libvips/colour/colourspace.c index 0c94cabe..1b05545d 100644 --- a/libvips/colour/colourspace.c +++ b/libvips/colour/colourspace.c @@ -490,7 +490,7 @@ static VipsColourRoute vips_colour_routes[] = { */ /** - * vips_colourspace_issupported: (method) + * vips_colourspace_issupported: * @image: input image * * Test if @image is in a colourspace that vips_colourspace() can process. diff --git a/libvips/conversion/conversion.c b/libvips/conversion/conversion.c index 5d7ddf3d..66a2f87f 100644 --- a/libvips/conversion/conversion.c +++ b/libvips/conversion/conversion.c @@ -70,7 +70,7 @@ */ /** - * vips_composite: + * vips_composite: (method) * @in: (array length=n) (transfer none): array of input images * @out: (out): output image * @n: number of input images @@ -79,10 +79,10 @@ * * Optional arguments: * - * * `compositing_space`: #VipsInterpretation to composite in - * * `premultiplied`: %gboolean, images are already premultiplied - * * `x`: #VipsArrayInt, position of subimages - * * `y`: #VipsArrayInt, position of subimages + * * @compositing_space: #VipsInterpretation to composite in + * * @premultiplied: %gboolean, images are already premultiplied + * * @x: #VipsArrayInt, position of subimages + * * @y: #VipsArrayInt, position of subimages * * Composite an array of images together. * @@ -109,11 +109,11 @@ * * The images do not need to match in size or format. They will be expanded to * the smallest common size and format in the usual way. Images are positioned - * using the `x` and `y` parameters, if set. + * using the @x and @y parameters, if set. * * Image are normally treated as unpremultiplied, so this operation can be used * directly on PNG images. If your images have been through vips_premultiply(), - * set `premultiplied`. + * set @premultiplied. * * See also: vips_insert(). * @@ -130,10 +130,10 @@ * * Optional arguments: * - * * `compositing_space`: #VipsInterpretation to composite in - * * `premultiplied`: %gboolean, images are already premultiplied - * * `x`: %gint, position of overlay - * * `y`: %gint, position of overlay + * * @compositing_space: #VipsInterpretation to composite in + * * @premultiplied: %gboolean, images are already premultiplied + * * @x: %gint, position of overlay + * * @y: %gint, position of overlay * * Composite @overlay on top of @base with @mode. See vips_composite(). * diff --git a/libvips/conversion/switch.c b/libvips/conversion/switch.c index f863fd86..0669039a 100644 --- a/libvips/conversion/switch.c +++ b/libvips/conversion/switch.c @@ -225,7 +225,7 @@ vips_switchv( VipsImage **tests, VipsImage **out, int n, va_list ap ) } /** - * vips_switch: + * vips_switch: (method) * @tests: (array length=n): test these images * @out: (out): output index image * @n: number of input images diff --git a/libvips/conversion/transpose3d.c b/libvips/conversion/transpose3d.c index fb45949f..d425a8bb 100644 --- a/libvips/conversion/transpose3d.c +++ b/libvips/conversion/transpose3d.c @@ -203,7 +203,7 @@ vips_transpose3d_init( VipsTranspose3d *transpose3d ) * output contains the Nth scanline, in order, from each input page. * * You can override the #VIPS_META_PAGE_HEIGHT metadata item with the optional - * `page_height` parameter. + * @page_height parameter. * * #VIPS_META_PAGE_HEIGHT in the output image is the number of pages in the * input image. diff --git a/libvips/deprecated/im_gradcor.c b/libvips/deprecated/im_gradcor.c index 9257683f..a607d8dd 100644 --- a/libvips/deprecated/im_gradcor.c +++ b/libvips/deprecated/im_gradcor.c @@ -36,6 +36,7 @@ */ + #ifdef HAVE_CONFIG_H #include #endif /*HAVE_CONFIG_H*/ @@ -46,6 +47,7 @@ #include #include + typedef struct { REGION *reg; int *region_xgrad; diff --git a/libvips/deprecated/im_linreg.c b/libvips/deprecated/im_linreg.c index 7300f7a4..c156efde 100644 --- a/libvips/deprecated/im_linreg.c +++ b/libvips/deprecated/im_linreg.c @@ -129,6 +129,7 @@ SKIP_ALL_DECL( guint32 ); SKIP_ALL_DECL( float ); SKIP_ALL_DECL( double ); + /** * im_linreg: * @ins: NULL-terminated array of input images diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c index 3c56f869..254b3ec2 100644 --- a/libvips/foreign/foreign.c +++ b/libvips/foreign/foreign.c @@ -1868,7 +1868,7 @@ vips_foreign_find_save_sub( VipsForeignSaveClass *save_class, * * See also: vips_foreign_find_save_buffer(), vips_image_write_to_file(). * - * Returns: (nullable): the name of an operation on success, %NULL on error + * Returns: the name of an operation on success, %NULL on error */ const char * vips_foreign_find_save( const char *name ) @@ -1938,7 +1938,7 @@ vips_foreign_get_suffixes_add_cb( VipsForeignSaveClass *save_class, * * Free the return result with g_strfreev(). * - * Returns: (transfer full) (array): all supported file extensions, as a + * Returns: (transfer full): all supported file extensions, as a * %NULL-terminated array. */ gchar ** @@ -2023,7 +2023,7 @@ vips_foreign_find_save_target_sub( VipsForeignSaveClass *save_class, * * See also: vips_image_write_to_buffer(). * - * Returns: (nullable): the name of an operation on success, %NULL on error + * Returns: the name of an operation on success, %NULL on error */ const char * vips_foreign_find_save_target( const char *name ) @@ -2081,7 +2081,7 @@ vips_foreign_find_save_buffer_sub( VipsForeignSaveClass *save_class, * * See also: vips_image_write_to_buffer(). * - * Returns: (nullable): the name of an operation on success, %NULL on error + * Returns: the name of an operation on success, %NULL on error */ const char * vips_foreign_find_save_buffer( const char *name ) diff --git a/libvips/include/vips/interpolate.h b/libvips/include/vips/interpolate.h index 2c248103..930e400e 100644 --- a/libvips/include/vips/interpolate.h +++ b/libvips/include/vips/interpolate.h @@ -33,11 +33,6 @@ #ifndef VIPS_INTERPOLATE_H #define VIPS_INTERPOLATE_H -#include -#include -#include -#include - #ifdef __cplusplus extern "C" { #endif /*__cplusplus*/ diff --git a/libvips/include/vips/sbuf.h b/libvips/include/vips/sbuf.h index 89d31eb1..b52458bb 100644 --- a/libvips/include/vips/sbuf.h +++ b/libvips/include/vips/sbuf.h @@ -33,10 +33,6 @@ #ifndef VIPS_SBUF_H #define VIPS_SBUF_H -#include -#include -#include - #ifdef __cplusplus extern "C" { #endif /*__cplusplus*/ diff --git a/libvips/include/vips/semaphore.h b/libvips/include/vips/semaphore.h index 86b24c45..cbef6fca 100644 --- a/libvips/include/vips/semaphore.h +++ b/libvips/include/vips/semaphore.h @@ -37,14 +37,13 @@ #ifndef VIPS_SEMAPHORE_H #define VIPS_SEMAPHORE_H -#include -#include -#include - #ifdef __cplusplus extern "C" { #endif /*__cplusplus*/ +#include +#include + /* Implement our own semaphores. */ typedef struct { diff --git a/libvips/include/vips/threadpool.h b/libvips/include/vips/threadpool.h index 02e5199d..78e7f968 100644 --- a/libvips/include/vips/threadpool.h +++ b/libvips/include/vips/threadpool.h @@ -39,18 +39,11 @@ #ifndef VIPS_THREADPOOL_H #define VIPS_THREADPOOL_H -#include -#include -#include -#include -#include -#include -#include - #ifdef __cplusplus extern "C" { #endif /*__cplusplus*/ +#include /* Per-thread state. Allocate functions can use these members to * communicate with work functions. diff --git a/libvips/include/vips/transform.h b/libvips/include/vips/transform.h index d1684a05..7f2ac326 100644 --- a/libvips/include/vips/transform.h +++ b/libvips/include/vips/transform.h @@ -31,10 +31,6 @@ #ifndef VIPS_TRANSFORM_H #define VIPS_TRANSFORM_H -#include -#include -#include - #ifdef __cplusplus extern "C" { #endif /*__cplusplus*/ diff --git a/libvips/iofuncs/header.c b/libvips/iofuncs/header.c index f1bd137d..407d2761 100644 --- a/libvips/iofuncs/header.c +++ b/libvips/iofuncs/header.c @@ -367,7 +367,7 @@ meta_init( VipsImage *im ) } /** - * vips_image_get_width: + * vips_image_get_width: (method) * @image: image to get from * * Returns: the number of pixels across the image. @@ -379,7 +379,7 @@ vips_image_get_width( const VipsImage *image ) } /** - * vips_image_get_height: + * vips_image_get_height: (method) * @image: image to get from * * Returns: the number of pixels down the image. @@ -391,7 +391,7 @@ vips_image_get_height( const VipsImage *image ) } /** - * vips_image_get_bands: + * vips_image_get_bands: (method) * @image: image to get from * * Returns: the number of bands (channels) in the image. @@ -403,7 +403,7 @@ vips_image_get_bands( const VipsImage *image ) } /** - * vips_image_get_format: + * vips_image_get_format: (method) * @image: image to get from * * Returns: the format of each band element. @@ -456,7 +456,7 @@ vips_image_get_format_max( VipsBandFormat format ) } /** - * vips_image_guess_format: + * vips_image_guess_format: (method) * @image: image to guess for * * Return the #VipsBandFormat for an image, guessing a sane value if @@ -541,7 +541,7 @@ vips_image_guess_format( const VipsImage *image ) } /** - * vips_image_get_coding: + * vips_image_get_coding: (method) * @image: image to get from * * Returns: the image coding @@ -553,7 +553,7 @@ vips_image_get_coding( const VipsImage *image ) } /** - * vips_image_get_interpretation: + * vips_image_get_interpretation: (method) * @image: image to get from * * Return the #VipsInterpretation set in the image header. @@ -601,7 +601,7 @@ vips_image_default_interpretation( const VipsImage *image ) } /** - * vips_image_guess_interpretation: + * vips_image_guess_interpretation: (method) * @image: image to guess for * * Return the #VipsInterpretation for an image, guessing a sane value if @@ -721,7 +721,7 @@ vips_image_guess_interpretation( const VipsImage *image ) } /** - * vips_image_get_xres: + * vips_image_get_xres: (method) * @image: image to get from * * Returns: the horizontal image resolution in pixels per millimeter. @@ -733,7 +733,7 @@ vips_image_get_xres( const VipsImage *image ) } /** - * vips_image_get_yres: + * vips_image_get_yres: (method) * @image: image to get from * * Returns: the vertical image resolution in pixels per millimeter. @@ -745,7 +745,7 @@ vips_image_get_yres( const VipsImage *image ) } /** - * vips_image_get_xoffset: + * vips_image_get_xoffset: (method) * @image: image to get from * * Returns: the horizontal position of the image origin, in pixels. @@ -757,7 +757,7 @@ vips_image_get_xoffset( const VipsImage *image ) } /** - * vips_image_get_yoffset: + * vips_image_get_yoffset: (method) * @image: image to get from * * Returns: the vertical position of the image origin, in pixels. @@ -769,7 +769,7 @@ vips_image_get_yoffset( const VipsImage *image ) } /** - * vips_image_get_filename: + * vips_image_get_filename: (method) * @image: image to get from * * Returns: the name of the file the image was loaded from, or NULL if there @@ -782,7 +782,7 @@ vips_image_get_filename( const VipsImage *image ) } /** - * vips_image_get_mode: + * vips_image_get_mode: (method) * @image: image to get from * * Image modes are things like `"t"`, meaning a memory buffer, and `"p"` @@ -797,7 +797,7 @@ vips_image_get_mode( const VipsImage *image ) } /** - * vips_image_get_scale: + * vips_image_get_scale: (method) * @image: image to get from * * Matrix images can have an optional `scale` field for use by integer @@ -818,7 +818,7 @@ vips_image_get_scale( const VipsImage *image ) } /** - * vips_image_get_offset: + * vips_image_get_offset: (method) * @image: image to get from * * Matrix images can have an optional `offset` field for use by integer @@ -839,7 +839,7 @@ vips_image_get_offset( const VipsImage *image ) } /** - * vips_image_get_page_height: + * vips_image_get_page_height: (method) * @image: image to get from * * Multi-page images can have a page height. Fetch it, and sanity check it. If @@ -864,7 +864,7 @@ vips_image_get_page_height( VipsImage *image ) } /** - * vips_image_get_n_pages: + * vips_image_get_n_pages: (method) * @image: image to get from * * Fetch and sanity-check #VIPS_META_N_PAGES. Default to 1 if not present or @@ -890,7 +890,7 @@ vips_image_get_n_pages( VipsImage *image ) } /** - * vips_image_get_n_subifds: + * vips_image_get_n_subifds: (method) * @image: image to get from * * Fetch and sanity-check #VIPS_META_N_SUBIFDS. Default to 0 if not present or @@ -913,7 +913,7 @@ vips_image_get_n_subifds( VipsImage *image ) } /** - * vips_image_get_orientation: + * vips_image_get_orientation: (method) * @image: image to get from * * Fetch and sanity-check #VIPS_META_ORIENTATION. Default to 1 (no rotate, @@ -937,7 +937,7 @@ vips_image_get_orientation( VipsImage *image ) } /** - * vips_image_get_orientation_swap: + * vips_image_get_orientation_swap: (method) * @image: image to get from * * Return %TRUE if applying the orientation would swap width and height. @@ -954,7 +954,7 @@ vips_image_get_orientation_swap( VipsImage *image ) } /** - * vips_image_get_data: + * vips_image_get_data: (method) * @image: image to get data for * * Return a pointer to the image's pixel data, if possible. This can involve @@ -978,7 +978,7 @@ vips_image_get_data( VipsImage *image ) } /** - * vips_image_init_fields: + * vips_image_init_fields: (method) * @image: image to init * @xsize: image width * @ysize: image height @@ -1113,7 +1113,7 @@ vips__image_copy_fields_array( VipsImage *out, VipsImage *in[] ) } /** - * vips_image_set: + * vips_image_set: (method) * @image: image to set the metadata on * @name: the name to give the metadata * @value: the %GValue to copy into the image @@ -1199,7 +1199,7 @@ vips_set_value_from_pointer( GValue *value, void *data ) } /** - * vips_image_get: + * vips_image_get: (method) * @image: image to get the field from from * @name: the name to fetch * @value_copy: (transfer full) (out caller-allocates): the %GValue is copied into this @@ -1287,7 +1287,7 @@ vips_image_get( const VipsImage *image, const char *name, GValue *value_copy ) } /** - * vips_image_get_typeof: + * vips_image_get_typeof: (method) * @image: image to test * @name: the name to search for * @@ -1331,7 +1331,7 @@ vips_image_get_typeof( const VipsImage *image, const char *name ) } /** - * vips_image_remove: + * vips_image_remove: (method) * @image: image to test * @name: the name to search for * @@ -1388,7 +1388,7 @@ vips_image_map_fn( VipsMeta *meta, VipsImageMapFn fn, void *a ) } /** - * vips_image_map: + * vips_image_map: (method) * @image: image to map over * @fn: (scope call): function to call for each header field * @a: (closure fn): user data for function @@ -1451,7 +1451,7 @@ add_fields( VipsImage *image, const char *field, GValue *value, void *a ) } /** - * vips_image_get_fields: + * vips_image_get_fields: (method) * @image: image to get fields from * * Get a %NULL-terminated array listing all the metadata field names on @image. @@ -1480,7 +1480,7 @@ vips_image_get_fields( VipsImage *image ) } /** - * vips_image_set_area: + * vips_image_set_area: (method) * @image: image to attach the metadata to * @name: metadata name * @free_fn: (scope async): free function for @data @@ -1527,7 +1527,7 @@ meta_get_value( const VipsImage *image, } /** - * vips_image_get_area: + * vips_image_get_area: (method) * @image: image to get the metadata from * @name: metadata name * @data: (out): return metadata value @@ -1557,11 +1557,11 @@ vips_image_get_area( const VipsImage *image, } /** - * vips_image_set_blob: + * vips_image_set_blob: (method) * @image: image to attach the metadata to * @name: metadata name * @free_fn: (scope async): free function for @data - * @data: (array length=length) (element-type guint8): pointer to area of memory + * @data: pointer to area of memory * @length: length of memory area * * Attaches @blob as a metadata item on @image under the name @name. A @@ -1583,10 +1583,10 @@ vips_image_set_blob( VipsImage *image, const char *name, } /** - * vips_image_set_blob_copy: + * vips_image_set_blob_copy: (method) * @image: image to attach the metadata to * @name: metadata name - * @data: (array length=length) (element-type guint8): pointer to area of memory + * @data: pointer to area of memory * @length: length of memory area * * Attaches @blob as a metadata item on @image under the name @name, taking @@ -1622,11 +1622,11 @@ vips_image_set_blob_copy( VipsImage *image, } /** - * vips_image_get_blob: + * vips_image_get_blob: (method) * @image: image to get the metadata from * @name: metadata name - * @data: (out) (array length=length) (element-type guint8): pointer to area of memory - * @length: (out): return the blob length here, optionally + * @data: pointer to area of memory + * @length: return the blob length here, optionally * * Gets @blob from @image under the name @name, optionally returns its length in * @length. A convenience @@ -1654,7 +1654,7 @@ vips_image_get_blob( const VipsImage *image, const char *name, } /** - * vips_image_get_int: + * vips_image_get_int: (method) * @image: image to get the header field from * @name: field name * @out: (out): return field value @@ -1681,7 +1681,7 @@ vips_image_get_int( const VipsImage *image, const char *name, int *out ) } /** - * vips_image_set_int: + * vips_image_set_int: (method) * @image: image to attach the metadata to * @name: metadata name * @i: metadata value @@ -1704,10 +1704,10 @@ vips_image_set_int( VipsImage *image, const char *name, int i ) } /** - * vips_image_get_double: + * vips_image_get_double: (method) * @image: image to get the header field from * @name: field name - * @out: (out): return field value + * @out: return field value * * Gets @out from @im under the name @name. * The value will be transformed into @@ -1731,7 +1731,7 @@ vips_image_get_double( const VipsImage *image, const char *name, double *out ) } /** - * vips_image_set_double: + * vips_image_set_double: (method) * @image: image to attach the metadata to * @name: metadata name * @d: metadata value @@ -1754,10 +1754,10 @@ vips_image_set_double( VipsImage *image, const char *name, double d ) } /** - * vips_image_get_string: + * vips_image_get_string: (method) * @image: image to get the header field from * @name: field name - * @out: (out) (transfer none): return field value + * @out: (transfer none): return field value * * Gets @out from @im under the name @name. * The field must be of type @@ -1805,7 +1805,7 @@ vips_image_get_string( const VipsImage *image, const char *name, } /** - * vips_image_set_string: + * vips_image_set_string: (method) * @image: image to attach the metadata to * @name: metadata name * @str: metadata value @@ -1828,10 +1828,10 @@ vips_image_set_string( VipsImage *image, const char *name, const char *str ) } /** - * vips_image_get_as_string: + * vips_image_get_as_string: (method) * @image: image to get the header field from * @name: field name - * @out: (out) (transfer full): return field value as string + * @out: (transfer full): return field value as string * * Returns @name from @image in @out. * This function will read any field, returning it as a printable string. @@ -1876,32 +1876,32 @@ vips_image_get_as_string( const VipsImage *image, } /** - * vips_image_print_field: + * vips_image_print_field: (method) * @image: image to get the header field from - * @field: field name + * @name: field name * * Prints field @name to stdout as ASCII. Handy for debugging. */ void -vips_image_print_field( const VipsImage *image, const char *field ) +vips_image_print_field( const VipsImage *image, const char *name ) { char *str; - if( vips_image_get_as_string( image, field, &str ) ) { + if( vips_image_get_as_string( image, name, &str ) ) { printf( "vips_image_print_field: unable to read field\n" ); return; } - printf( ".%s: %s\n", field, str ); + printf( ".%s: %s\n", name, str ); g_free( str ); } /** - * vips_image_get_image: + * vips_image_get_image: (method) * @image: image to get the metadata from * @name: metadata name - * @out: (out) (transfer full): return metadata value + * @out: (transfer full): return metadata value * * Gets @out from @im under the name @name. * The field must be of type @@ -1929,7 +1929,7 @@ vips_image_get_image( const VipsImage *image, } /** - * vips_image_set_image: + * vips_image_set_image: (method) * @image: image to attach the metadata to * @name: metadata name * @im: metadata value @@ -1951,11 +1951,11 @@ vips_image_set_image( VipsImage *image, const char *name, VipsImage *im ) } /** - * vips_image_get_array_int: + * vips_image_get_array_int: (method) * @image: image to get the metadata from * @name: metadata name - * @out: (out) (array length=n) (transfer none): return pointer to array - * @n: (out) (optional): return the number of elements here, optionally + * @out: (transfer none): return pointer to array + * @n: (allow-none): return the number of elements here, optionally * * Gets @out from @im under the name @name. * The field must be of type @@ -1985,7 +1985,7 @@ vips_image_get_array_int( VipsImage *image, const char *name, } /** - * vips_image_set_array_int: + * vips_image_set_array_int: (method) * @image: image to attach the metadata to * @name: metadata name * @array: (array length=n) (allow-none): array of ints @@ -2009,11 +2009,11 @@ vips_image_set_array_int( VipsImage *image, const char *name, } /** - * vips_image_get_array_double: + * vips_image_get_array_double: (method) * @image: image to get the metadata from * @name: metadata name - * @out: (out) (array length=n) (transfer none): return pointer to array - * @n: (out) (optional): return the number of elements here, optionally + * @out: (transfer none): return pointer to array + * @n: (allow-none): return the number of elements here, optionally * * Gets @out from @im under the name @name. * The field must be of type @@ -2043,7 +2043,7 @@ vips_image_get_array_double( VipsImage *image, const char *name, } /** - * vips_image_set_array_double: + * vips_image_set_array_double: (method) * @image: image to attach the metadata to * @name: metadata name * @array: (array length=n) (allow-none): array of doubles @@ -2067,7 +2067,7 @@ vips_image_set_array_double( VipsImage *image, const char *name, } /** - * vips_image_history_printf: + * vips_image_history_printf: (method) * @image: add history line to this image * @format: printf() format string * @...: arguments to format string @@ -2127,7 +2127,7 @@ vips_image_history_printf( VipsImage *image, const char *fmt, ... ) } /** - * vips_image_history_args: + * vips_image_history_args: (method) * @image: image to attach history line to * @name: program name * @argc: number of program arguments @@ -2163,7 +2163,7 @@ vips_image_history_args( VipsImage *image, } /** - * vips_image_get_history: + * vips_image_get_history: (method) * @image: get history from here * * This function reads the image history as a C string. The string is owned diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c index 8c74c7c4..a0749662 100644 --- a/libvips/iofuncs/image.c +++ b/libvips/iofuncs/image.c @@ -1224,7 +1224,7 @@ vips_image_class_init( VipsImageClass *class ) /** * VipsImage::preeval: * @image: the image to be calculated - * @progress: (type VipsProgress): #VipsProgress for this image + * @progress: #VipsProgress for this image * * The ::preeval signal is emitted once before computation of @image * starts. It's a good place to set up evaluation feedback. @@ -1244,7 +1244,7 @@ vips_image_class_init( VipsImageClass *class ) /** * VipsImage::eval: * @image: the image being calculated - * @progress: (type VipsProgress): #VipsProgress for this image + * @progress: #VipsProgress for this image * * The ::eval signal is emitted once per work unit (typically a 128 x * 128 area of pixels) during image computation. @@ -1268,7 +1268,7 @@ vips_image_class_init( VipsImageClass *class ) /** * VipsImage::posteval: * @image: the image that was calculated - * @progress: (type VipsProgress): #VipsProgress for this image + * @progress: #VipsProgress for this image * * The ::posteval signal is emitted once at the end of the computation * of @image. It's a good place to shut down evaluation feedback. @@ -1288,7 +1288,7 @@ vips_image_class_init( VipsImageClass *class ) /** * VipsImage::written: * @image: the image that was calculated - * @result: (out) (type gint): set to non-zero to indicate error + * @result: set to non-zero to indicate error * * The ::written signal is emitted just after an image has been * written to. It is @@ -1398,7 +1398,7 @@ vips_image_invalidate_all_cb( VipsImage *image, void *a, void *b ) } /** - * vips_image_invalidate_all: + * vips_image_invalidate_all: (method) * @image: #VipsImage to invalidate * * Invalidate all pixel caches on @image and any downstream images, that @@ -1438,7 +1438,7 @@ vips_image_minimise_all_cb( VipsImage *image, void *a, void *b ) } /** - * vips_image_minimise_all: + * vips_image_minimise_all: (method) * @image: #VipsImage to minimise * * Minimise memory use on this image and any upstream images, that is, images @@ -1462,7 +1462,7 @@ vips_image_minimise_all( VipsImage *image ) } /** - * vips_image_is_sequential: + * vips_image_is_sequential: (method) * @image: #VipsImage to minimise * * TRUE if any of the images upstream from @image were opened in sequential @@ -1599,7 +1599,7 @@ vips_image_posteval( VipsImage *image ) } /** - * vips_image_set_progress: + * vips_image_set_progress: (method) * @image: image to signal progress on * @progress: turn progress reporting on or off * @@ -1622,7 +1622,7 @@ vips_image_set_progress( VipsImage *image, gboolean progress ) } /** - * vips_image_iskilled: + * vips_image_iskilled: (method) * @image: image to test * * If @image has been killed (see vips_image_set_kill()), set an error message, @@ -1659,7 +1659,7 @@ vips_image_iskilled( VipsImage *image ) } /** - * vips_image_set_kill: + * vips_image_set_kill: (method) * @image: image to test * @kill: the kill state * @@ -2468,7 +2468,7 @@ vips_image_new_from_image1( VipsImage *image, double c ) } /** - * vips_image_set_delete_on_close: + * vips_image_set_delete_on_close: (method) * @image: image to set * @delete_on_close: format of file * @@ -2599,7 +2599,7 @@ vips_image_write_gen( VipsRegion *or, } /** - * vips_image_write: + * vips_image_write: (method) * @image: image to write * @out: (out): write to this image * @@ -2652,7 +2652,7 @@ vips_image_write( VipsImage *image, VipsImage *out ) } /** - * vips_image_write_to_file: + * vips_image_write_to_file: (method) * @image: image to write * @name: write to this file * @...: %NULL-terminated list of optional named arguments @@ -2714,7 +2714,7 @@ vips_image_write_to_file( VipsImage *image, const char *name, ... ) } /** - * vips_image_write_to_buffer: + * vips_image_write_to_buffer: (method) * @in: image to write * @suffix: format to write * @buf: (array length=size) (element-type guint8) (transfer full): return buffer start here @@ -2806,7 +2806,7 @@ vips_image_write_to_buffer( VipsImage *in, } /** - * vips_image_write_to_target: + * vips_image_write_to_target: (method) * @in: image to write * @suffix: format to write * @target: target to write to @@ -2851,7 +2851,7 @@ vips_image_write_to_target( VipsImage *in, } /** - * vips_image_write_to_memory: + * vips_image_write_to_memory: (method) * @in: image to write * @size: return buffer length here * @@ -2896,7 +2896,7 @@ vips_image_write_to_memory( VipsImage *in, size_t *size_out ) } /** - * vips_image_decode: + * vips_image_decode: (method) * @in: image to decode * @out: (out): write to this image * @@ -2932,7 +2932,7 @@ vips_image_decode( VipsImage *in, VipsImage **out ) } /** - * vips_image_decode_predict: + * vips_image_decode_predict: (method) * @in: image to decode * @bands: (out): predict bands here * @format: (out): predict format here @@ -2971,7 +2971,7 @@ vips_image_decode_predict( VipsImage *in, } /** - * vips_image_encode: + * vips_image_encode: (method) * @in: image to encode * @out: (out): write to this image * @coding: coding to apply @@ -3003,7 +3003,7 @@ vips_image_encode( VipsImage *in, VipsImage **out, VipsCoding coding ) } /** - * vips_image_isMSBfirst: + * vips_image_isMSBfirst: (method) * @image: image to test * * Return %TRUE if @image is in most-significant- @@ -3020,7 +3020,7 @@ vips_image_isMSBfirst( VipsImage *image ) } /** - * vips_image_isfile: + * vips_image_isfile: (method) * @image: image to test * * Return %TRUE if @image represents a file on disc in some way. @@ -3048,7 +3048,7 @@ vips_image_isfile( VipsImage *image ) } /** - * vips_image_ispartial: + * vips_image_ispartial: (method) * @image: image to test * * Return %TRUE if @im represents a partial image (a delayed calculation). @@ -3063,7 +3063,7 @@ vips_image_ispartial( VipsImage *image ) } /** - * vips_image_hasalpha: + * vips_image_hasalpha: (method) * @image: image to check * * Look at an image's interpretation and see if it has extra alpha bands. For @@ -3110,7 +3110,7 @@ vips_image_hasalpha( VipsImage *image ) } /** - * vips_image_write_prepare: + * vips_image_write_prepare: (method) * @image: image to prepare * * Call this after setting header fields (width, height, and so on) to @@ -3174,7 +3174,7 @@ vips_image_write_prepare( VipsImage *image ) } /** - * vips_image_write_line: + * vips_image_write_line: (method) * @image: image to write to * @ypos: vertical position of scan-line to write * @linebuffer: scanline of pixels @@ -3310,7 +3310,7 @@ vips_image_rewind_output( VipsImage *image ) } /** - * vips_image_copy_memory: + * vips_image_copy_memory: (method) * @image: image to copy to a memory buffer * * Make an image which is an area of memory. @@ -3363,7 +3363,7 @@ vips_image_copy_memory( VipsImage *image ) } /** - * vips_image_wio_input: + * vips_image_wio_input: (method) * @image: image to transform * * Check that an image is readable via the VIPS_IMAGE_ADDR() macro, that is, @@ -3539,7 +3539,7 @@ vips__image_wio_output( VipsImage *image ) } /** - * vips_image_inplace: + * vips_image_inplace: (method) * @image: image to make read-write * * Gets @image ready for an in-place operation, such as vips_draw_circle(). @@ -3599,7 +3599,7 @@ vips_image_inplace( VipsImage *image ) } /** - * vips_image_pio_input: + * vips_image_pio_input: (method) * @image: image to check * * Check that an image is readable with vips_region_prepare() and friends. @@ -3675,7 +3675,7 @@ vips_image_pio_input( VipsImage *image ) } /** - * vips_image_pio_output: + * vips_image_pio_output: (method) * @image: image to check * * Check that an image is writeable with vips_image_generate(). If it isn't, diff --git a/libvips/iofuncs/object.c b/libvips/iofuncs/object.c index cfcfdeb8..7152537b 100644 --- a/libvips/iofuncs/object.c +++ b/libvips/iofuncs/object.c @@ -430,12 +430,12 @@ vips_object_dump( VipsObject *object, VipsBuf *buf ) } void -vips_object_print_summary_class( VipsObjectClass *klass ) +vips_object_print_summary_class( VipsObjectClass *class ) { char str[2048]; VipsBuf buf = VIPS_BUF_STATIC( str ); - vips_object_summary_class( klass, &buf ); + vips_object_summary_class( class, &buf ); printf( "%s\n", vips_buf_all( &buf ) ); } diff --git a/libvips/iofuncs/rect.c b/libvips/iofuncs/rect.c index 9ce06459..9038efb9 100644 --- a/libvips/iofuncs/rect.c +++ b/libvips/iofuncs/rect.c @@ -85,7 +85,7 @@ vips_rect_includespoint( const VipsRect *r, int x, int y ) } /** - * vips_rect_isempty: + * vips_rect_isempty: (method) * @r: rectangle to test * * Is @r empty? ie. zero width or height. @@ -99,7 +99,7 @@ vips_rect_isempty( const VipsRect *r ) } /** - * vips_rect_includesrect: + * vips_rect_includesrect: (method) * @r1: outer rectangle * @r2: inner rectangle * @@ -117,7 +117,7 @@ vips_rect_includesrect( const VipsRect *r1, const VipsRect *r2 ) } /** - * vips_rect_equalsrect: + * vips_rect_equalsrect: (method) * @r1: first rectangle * @r2: second rectangle * @@ -133,7 +133,7 @@ vips_rect_equalsrect( const VipsRect *r1, const VipsRect *r2 ) } /** - * vips_rect_overlapsrect: + * vips_rect_overlapsrect: (method) * @r1: first rectangle * @r2: second rectangle * @@ -152,7 +152,7 @@ vips_rect_overlapsrect( const VipsRect *r1, const VipsRect *r2 ) } /** - * vips_rect_marginadjust: + * vips_rect_marginadjust: (method) * @r: rectangle to adjust * @n: enlarge by * @@ -242,7 +242,7 @@ vips_rect_dup( const VipsRect *r ) } /** - * vips_rect_normalise: + * vips_rect_normalise: (method) * @r: rect to normalise * * Make sure width and height are >0 by moving the origin and flipping the diff --git a/libvips/iofuncs/region.c b/libvips/iofuncs/region.c index ff33ac4b..26852399 100644 --- a/libvips/iofuncs/region.c +++ b/libvips/iofuncs/region.c @@ -532,7 +532,7 @@ vips_region_new( VipsImage *image ) */ /** - * vips_region_buffer: + * vips_region_buffer: (method) * @reg: region to operate upon * @r: #VipsRect of pixels you need to be able to address * @@ -601,7 +601,7 @@ vips_region_buffer( VipsRegion *reg, const VipsRect *r ) } /** - * vips_region_image: + * vips_region_image: (method) * @reg: region to operate upon * @r: #VipsRect of pixels you need to be able to address * @@ -681,7 +681,7 @@ vips_region_image( VipsRegion *reg, const VipsRect *r ) } /** - * vips_region_region: + * vips_region_region: (method) * @reg: region to operate upon * @dest: region to connect to * @r: #VipsRect of pixels you need to be able to address @@ -816,7 +816,7 @@ vips_region_equalsregion( VipsRegion *reg1, VipsRegion *reg2 ) } /** - * vips_region_position: + * vips_region_position: (method) * @reg: region to operate upon * @x: position to move to * @y: position to move to @@ -900,7 +900,7 @@ vips_region_fill( VipsRegion *reg, } /** - * vips_region_paint: + * vips_region_paint: (method) * @reg: region to operate upon * @r: area to paint * @value: value to paint @@ -969,7 +969,7 @@ vips_region_paint( VipsRegion *reg, const VipsRect *r, int value ) } /** - * vips_region_paint_pel: + * vips_region_paint_pel: (method) * @reg: region to operate upon * @r: area to paint * @ink: value to paint @@ -1020,7 +1020,7 @@ vips_region_paint_pel( VipsRegion *reg, const VipsRect *r, const VipsPel *ink ) } /** - * vips_region_black: + * vips_region_black: (method) * @reg: region to operate upon * * Paints 0 into the valid part of @reg. @@ -1606,7 +1606,7 @@ vips_region_generate( VipsRegion *reg, void *a ) } /** - * vips_region_prepare: + * vips_region_prepare: (method) * @reg: region to prepare * @r: #VipsRect of pixels you need to be able to address * @@ -1733,9 +1733,9 @@ vips_region_prepare_to_generate( VipsRegion *reg, } /** - * vips_region_prepare_to: + * vips_region_prepare_to: (method) * @reg: region to prepare - * @dest: region to write to + * @dest: (inout): region to write to * @r: #VipsRect of pixels you need to be able to address * @x: postion of @r in @dest * @y: postion of @r in @dest @@ -1966,7 +1966,7 @@ vips_region_fetch( VipsRegion *region, } /** - * vips_region_width: + * vips_region_width: (method) * @region: fetch width from this * * Returns: Width of the pixels held in region. @@ -1978,7 +1978,7 @@ vips_region_width( VipsRegion *region ) } /** - * vips_region_height: + * vips_region_height: (method) * @region: fetch height from this * * Returns: Height of the pixels held in region. @@ -1990,7 +1990,7 @@ vips_region_height( VipsRegion *region ) } /** - * vips_region_invalidate: + * vips_region_invalidate: (method) * @reg: region to invalidate * * Mark a region as containing invalid pixels. Calling this function means diff --git a/libvips/iofuncs/reorder.c b/libvips/iofuncs/reorder.c index 361942c3..0994a900 100644 --- a/libvips/iofuncs/reorder.c +++ b/libvips/iofuncs/reorder.c @@ -315,7 +315,7 @@ vips__reorder_set_input( VipsImage *image, VipsImage **in ) /** * vips_reorder_prepare_many: (method) * @image: the image that's being written - * @regions: (array): the set of regions to prepare + * @regions: (array) (element-type VipsRegion): the set of regions to prepare * @r: the #VipsRect to prepare on each region * * vips_reorder_prepare_many() runs vips_region_prepare() on each region in diff --git a/libvips/iofuncs/type.c b/libvips/iofuncs/type.c index bbbe14b2..2974c4c5 100644 --- a/libvips/iofuncs/type.c +++ b/libvips/iofuncs/type.c @@ -237,7 +237,7 @@ vips_area_unref( VipsArea *area ) } /** - * vips_area_new: + * vips_area_new: (constructor) * @free_fn: (scope async): @data will be freed with this function * @data: data will be freed with this function * @@ -385,12 +385,12 @@ vips_area_new_array_object( int n ) } /** - * vips_area_get_data: + * vips_area_get_data: (method) * @area: #VipsArea to fetch from - * @length: (out) (optional): optionally return length in bytes here - * @n: (out) (optional): optionally return number of elements here - * @type: (out) (optional): optionally return element type here - * @sizeof_type: (out) (optional): optionally return sizeof() element type here + * @length: (out optional): optionally return length in bytes here + * @n: (out optional): optionally return number of elements here + * @type: (out optional): optionally return element type here + * @sizeof_type: (out optional): optionally return sizeof() element type here * * Return the data pointer plus optionally the length in bytes of an area, * the number of elements, the %GType of each element and the sizeof() each @@ -564,7 +564,7 @@ transform_save_string_ref_string( const GValue *src_value, GValue *dest_value ) * * See also: vips_area_unref(). * - * Returns: (transfer full) (nullable): the new #VipsRefString, or NULL on error. + * Returns: (transfer full): the new #VipsRefString, or NULL on error. */ VipsRefString * vips_ref_string_new( const char *str ) @@ -586,7 +586,7 @@ vips_ref_string_new( const char *str ) /** * vips_ref_string_get: * @refstr: the #VipsRefString to fetch from - * @length: (out) (optional): return length here, optionally + * @length: (allow-none): return length here, optionally * * Get a pointer to the private string inside a refstr. Handy for language * bindings. @@ -632,7 +632,7 @@ vips_ref_string_get_type( void ) * @length: number of bytes in @data * * Like vips_area_new(), but track a length as well. The returned #VipsBlob - * takes ownership of @data and will free it with @free_fn. Pass %NULL for + * takes ownership of @data and will free it with @free_fn. Pass NULL for * @free_fn to not transfer ownership. * * An area of mem with a free func and a length (some sort of binary object, @@ -700,7 +700,7 @@ vips_blob_get( VipsBlob *blob, size_t *length ) /* vips_blob_set: * @blob: #VipsBlob to set - * @free_fn: (scope async) (nullable): @data will be freed with this function + * @free_fn: (scope async) (allow-none): @data will be freed with this function * @data: (array length=length) (element-type guint8) (transfer full): data to store * @length: number of bytes in @data * @@ -1405,7 +1405,7 @@ vips_array_image_empty( void ) } /** - * vips_array_image_append: + * vips_array_image_append: (method) * @array: (transfer none): append to this * @image: add this * @@ -1445,7 +1445,7 @@ vips_array_image_append( VipsArrayImage *array, VipsImage *image ) } /** - * vips_array_image_get: + * vips_array_image_get: (method) * @array: the #VipsArrayImage to fetch from * @n: length of array * @@ -1509,7 +1509,7 @@ vips_array_image_get_type( void ) /** * vips_value_set_area: - * @value: set this value + * @value: (out): set this value * @free_fn: (scope async): data will be freed with this function * @data: set @value to track this pointer * @@ -1529,7 +1529,7 @@ vips_value_set_area( GValue *value, VipsCallbackFn free_fn, void *data ) /** * vips_value_get_area: * @value: get from this value - * @length: (out) (optional): optionally return length here + * @length: (allow-none): optionally return length here * * Get the pointer from an area. Don't touch count (area is static). * @@ -1605,7 +1605,7 @@ vips_value_set_save_stringf( GValue *value, const char *fmt, ... ) /** * vips_value_get_ref_string: * @value: %GValue to get from - * @length: (out) (optional): return length here, optionally + * @length: (allow-none): return length here, optionally * * Get the C string held internally by the %GValue. * @@ -1674,7 +1674,7 @@ vips_value_set_blob( GValue *value, /** * vips_value_set_blob_free: - * @value: GValue to set + * @value: (out): GValue to set * @data: pointer to area of memory * @length: length of memory area * @@ -1701,7 +1701,7 @@ vips_value_set_blob_free( GValue *value, void *data, size_t length ) /** * vips_value_get_blob: * @value: GValue to set - * @length: (out) (optional): optionally return length of memory area + * @length: (allow-none): optionally return length of memory area * * Returns the data pointer from a blob. Optionally returns the length too. * @@ -1744,9 +1744,9 @@ vips_value_set_array( GValue *value, int n, GType type, size_t sizeof_type ) /** * vips_value_get_array: * @value: %GValue to get from - * @n: (out) (optional): return the number of elements here, optionally - * @type: (out) (optional): return the type of each element here, optionally - * @sizeof_type: (out) (optional): return the sizeof each element here, optionally + * @n: (allow-none): return the number of elements here, optionally + * @type: (allow-none): return the type of each element here, optionally + * @sizeof_type: (allow-none): return the sizeof each element here, optionally * * Return the pointer to the array held by @value. * Optionally return the other properties of the array in @n, @type, @@ -1781,14 +1781,14 @@ vips_value_get_array( const GValue *value, /** * vips_value_get_array_int: * @value: %GValue to get from - * @n: (out) (optional): return the number of elements here, optionally + * @n: (allow-none): return the number of elements here, optionally * * Return the start of the array of ints held by @value. * optionally return the number of elements in @n. * * See also: vips_array_int_new(). * - * Returns: (transfer none) (array length=n): The array address. + * Returns: (transfer none): The array address. */ int * vips_value_get_array_int( const GValue *value, int *n ) @@ -1798,7 +1798,7 @@ vips_value_get_array_int( const GValue *value, int *n ) /** * vips_value_set_array_int: - * @value: %GValue to get from + * @value: (out): %GValue to get from * @array: (array length=n) (allow-none): array of ints * @n: the number of elements * @@ -1822,14 +1822,14 @@ vips_value_set_array_int( GValue *value, const int *array, int n ) /** * vips_value_get_array_double: * @value: %GValue to get from - * @n: (out) (optional): return the number of elements here, optionally + * @n: (allow-none): return the number of elements here, optionally * * Return the start of the array of doubles held by @value. * optionally return the number of elements in @n. * * See also: vips_array_double_new(). * - * Returns: (transfer none) (array length=n): The array address. + * Returns: (transfer none): The array address. */ double * vips_value_get_array_double( const GValue *value, int *n ) @@ -1839,7 +1839,7 @@ vips_value_get_array_double( const GValue *value, int *n ) /** * vips_value_set_array_double: - * @value: %GValue to get from + * @value: (out): %GValue to get from * @array: (array length=n) (allow-none): array of doubles * @n: the number of elements * @@ -1863,14 +1863,14 @@ vips_value_set_array_double( GValue *value, const double *array, int n ) /** * vips_value_get_array_image: * @value: %GValue to get from - * @n: (out) (optional): return the number of elements here, optionally + * @n: (allow-none): return the number of elements here, optionally * * Return the start of the array of images held by @value. * optionally return the number of elements in @n. * * See also: vips_value_set_array_image(). * - * Returns: (transfer none) (array length=n): The array address. + * Returns: (transfer none): The array address. */ VipsImage ** vips_value_get_array_image( const GValue *value, int *n ) @@ -1880,7 +1880,7 @@ vips_value_get_array_image( const GValue *value, int *n ) /** * vips_value_set_array_image: - * @value: %GValue to get from + * @value: (out): %GValue to get from * @n: the number of elements * * Set @value to hold an array of images. Pass in the array length in @n. @@ -1901,14 +1901,14 @@ vips_value_set_array_image( GValue *value, int n ) /** * vips_value_get_array_object: (skip) * @value: %GValue to get from - * @n: (out) (optional): return the number of elements here, optionally + * @n: (allow-none): return the number of elements here, optionally * * Return the start of the array of %GObject held by @value. * Optionally return the number of elements in @n. * * See also: vips_area_new_array_object(). * - * Returns: (transfer none) (array length=n): The array address. + * Returns: (transfer none): The array address. */ GObject ** vips_value_get_array_object( const GValue *value, int *n )