fix some more introspection warnings

This commit is contained in:
John Cupitt 2022-02-15 09:48:01 +00:00
parent 542dd06999
commit 257d84108e
14 changed files with 19 additions and 61 deletions

View File

@ -192,7 +192,7 @@ vips_transpose3d_init( VipsTranspose3d *transpose3d )
*
* Optional arguments:
*
* @page_height: %gint, size of each input page
* * @page_height: %gint, size of each input page
*
* Transpose a volumetric image.
*

View File

@ -474,7 +474,6 @@ vips_canny_init( VipsCanny *canny )
* vips_canny: (method)
* @in: input image
* @out: (out): output image
* @sigma: how large a mask to use
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

View File

@ -37,8 +37,6 @@
*/
/** HEADERS **/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /*HAVE_CONFIG_H*/
@ -50,8 +48,6 @@
#include <vips/vips7compat.h>
/** LOCAL TYPES **/
typedef struct {
REGION *reg;
int *region_xgrad;
@ -61,9 +57,6 @@ typedef struct {
}
gradcor_seq_t;
/** LOCAL FUNCTION DECLARATIONS **/
static void *gradcor_start( IMAGE *out, void *vptr_large, void *unrequired );
static int gradcor_stop( void *vptr_seq, void *unrequired, void *unreq2 );
static int gradcor_gen( REGION *to_make, void *vptr_seq, void *unrequired, void *vptr_grads );
@ -90,9 +83,6 @@ XGRAD_GEN_DECLARATION( double );
YGRAD_GEN_DECLARATION( double );
#endif
/** EXPORTED FUNCTION DEFINITIONS **/
int im_gradcor_raw( IMAGE *large, IMAGE *small, IMAGE *out ){
#define FUNCTION_NAME "im_gradcor_raw"
@ -335,9 +325,6 @@ int im_grad_y( IMAGE *in, IMAGE *out ){
#undef FUNCTION_NAME
}
/** LOCAL FUNCTION DEFINITIONS **/
static void *gradcor_start( IMAGE *out, void *vptr_large, void *unrequired ){
gradcor_seq_t *seq= IM_NEW( NULL, gradcor_seq_t );

View File

@ -40,8 +40,6 @@
*/
/** HEADERS **/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /* HAVE_CONFIG_H */
@ -52,9 +50,6 @@
#include <vips/vips.h>
#include <vips/vips7compat.h>
/** TYPES **/
typedef struct {
unsigned int n;
@ -81,9 +76,6 @@ LINREG_SEQ( guint32 );
LINREG_SEQ( float );
LINREG_SEQ( double );
/** LOCAL FUNCTION DECLARATIONS **/
static x_set *x_anal( IMAGE *im, double *xs, unsigned int n );
#define LINREG_START_DECL( TYPE ) static void * linreg_start_ ## TYPE( IMAGE *, void *, void * );
@ -138,8 +130,6 @@ SKIP_ALL_DECL( float );
SKIP_ALL_DECL( double );
/** EXPORTED FUNCTION DEFINITION **/
/**
* im_linreg:
* @ins: NULL-terminated array of input images
@ -248,9 +238,6 @@ int im_linreg( IMAGE **ins, IMAGE *out, double *xs ){
#undef FUNCTION_NAME
}
/** LOCAL FUNCTION DECLARATIONS **/
static x_set *x_anal( IMAGE *im, double *xs, unsigned int n ){
unsigned int i;

View File

@ -41,8 +41,6 @@
*/
/** HEADERS **/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /*HAVE_CONFIG_H*/
@ -56,21 +54,12 @@
#include <vips/vips.h>
#include <vips/vips7compat.h>
/** CONSTANTS **/
#define TOO_SMALL ( 2.0 * DBL_MIN )
/* DBL_MIN is smallest *normalized* double precision float */
/** MACROS **/
#define MATRIX( mask, i, j ) ( (mask)-> coeff[ (j) + (i) * (mask)-> xsize ] )
/* use DOUBLEMASK or INTMASK as matrix type */
/** LOCAL FUNCTION DECLARATIONS **/
static int
mat_inv_lu(
DOUBLEMASK *inv,
@ -84,9 +73,6 @@ mat_inv_direct(
const char *function_name
);
/** EXPORTED FUNCTION DEFINITIONS **/
/**
* im_lu_decomp:
* @mat: matrix to decompose
@ -429,9 +415,6 @@ im_invmat(
return to_return;
}
/** LOCAL FUNCTION DEFINITIONS **/
static int
mat_inv_lu(
DOUBLEMASK *inv,

View File

@ -1927,7 +1927,7 @@ vips_foreign_get_suffixes_add_cb( VipsForeignSaveClass *save_class,
}
/**
* vips_foreign_get_suffixes: (method)
* vips_foreign_get_suffixes:
*
* Get a %NULL-terminated array listing all the supported suffixes.
*

View File

@ -75,6 +75,10 @@ struct _VipsImage;
typedef struct _VipsImage VipsImage;
struct _VipsRegion;
typedef struct _VipsRegion VipsRegion;
struct _VipsSource;
typedef struct _VipsSource VipsSource;
struct _VipsTarget;
typedef struct _VipsTarget VipsTarget;
#ifdef __cplusplus
}

View File

@ -119,7 +119,7 @@ void vips_pipe_read_limit_set( gint64 limit );
* so readers can rewind and read again. We don't buffer data during the
* decode stage.
*/
typedef struct _VipsSource {
struct _VipsSource {
VipsConnection parent_object;
/* We have two phases:
@ -182,7 +182,7 @@ typedef struct _VipsSource {
void *mmap_baseaddr;
size_t mmap_length;
} VipsSource;
};
typedef struct _VipsSourceClass {
VipsConnectionClass parent_class;
@ -370,7 +370,7 @@ VipsSourceGInputStream *vips_source_g_input_stream_new( GInputStream *stream );
/* Output to something like a socket, pipe or memory area.
*/
typedef struct _VipsTarget {
struct _VipsTarget {
VipsConnection parent_object;
/*< private >*/
@ -397,7 +397,7 @@ typedef struct _VipsTarget {
unsigned char output_buffer[VIPS_TARGET_BUFFER_SIZE];
int write_point;
} VipsTarget;
};
typedef struct _VipsTargetClass {
VipsConnectionClass parent_class;

View File

@ -276,7 +276,7 @@ int vips_unpremultiply( VipsImage *in, VipsImage **out, ... )
int vips_composite( VipsImage **in, VipsImage **out, int n, int *mode, ... )
__attribute__((sentinel));
int vips_composite2( VipsImage *base, VipsImage *overlay, VipsImage **out,
VipsBlendMode mode1, ... )
VipsBlendMode mode, ... )
__attribute__((sentinel));
int vips_falsecolour( VipsImage *in, VipsImage **out, ... )

View File

@ -223,7 +223,7 @@ int vips_image_get_string( const VipsImage *image,
const char *name, const char **out );
void vips_image_set_string( VipsImage *image,
const char *name, const char *str );
void vips_image_print_field( const VipsImage *image, const char *field );
void vips_image_print_field( const VipsImage *image, const char *name );
int vips_image_get_image( const VipsImage *image,
const char *name, VipsImage **out );
void vips_image_set_image( VipsImage *image, const char *name, VipsImage *im );

View File

@ -415,8 +415,8 @@ vips_image_get_format( const VipsImage *image )
}
/**
* vips_image_get_format_max: (method)
* @image: image to get from
* vips_image_get_format_max:
* @format: the format
*
* Returns: the maximum numeric value possible for this format.
*/

View File

@ -1903,7 +1903,7 @@ vips_region_prepare_many( VipsRegion **reg, const VipsRect *r )
/**
* vips_region_fetch: (method)
* @reg: region to fetch pixels from
* @region: region to fetch pixels from
* @left: area of pixels to fetch
* @top: area of pixels to fetch
* @width: area of pixels to fetch

View File

@ -387,10 +387,10 @@ vips_area_new_array_object( int n )
/**
* vips_area_get_data: (method)
* @area: #VipsArea to fetch from
* @length: (optional): optionally return length in bytes here
* @n: (optional): optionally return number of elements here
* @type: (optional): optionally return element type here
* @sizeof_type: (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

View File

@ -49,8 +49,6 @@ if get_option('introspection')
header: 'vips/vips.h',
sources: libvips_sources,
dependencies: libvips_deps,
# TODO: Fix all the warnings and remove this extra_arg
extra_args: '--quiet',
includes: 'GObject-2.0',
install: true
)