yet mmore doc fixes

classes are working again in gtk-doc, yay
This commit is contained in:
John Cupitt 2016-07-13 22:39:16 +01:00
parent b814baa78c
commit 9c18f1b4d5
9 changed files with 41 additions and 22 deletions

View File

@ -609,7 +609,7 @@ vips_foreign_find_load_buffer( const void *data, size_t size )
gboolean gboolean
vips_foreign_is_a( const char *loader, const char *filename ) vips_foreign_is_a( const char *loader, const char *filename )
{ {
VipsObjectClass *class; const VipsObjectClass *class;
VipsForeignLoadClass *load_class; VipsForeignLoadClass *load_class;
if( !(class = vips_class_find( "VipsForeignLoad", loader )) ) if( !(class = vips_class_find( "VipsForeignLoad", loader )) )
@ -636,7 +636,7 @@ vips_foreign_is_a( const char *loader, const char *filename )
gboolean gboolean
vips_foreign_is_a_buffer( const char *loader, const void *data, size_t size ) vips_foreign_is_a_buffer( const char *loader, const void *data, size_t size )
{ {
VipsObjectClass *class; const VipsObjectClass *class;
VipsForeignLoadClass *load_class; VipsForeignLoadClass *load_class;
if( !(class = vips_class_find( "VipsForeignLoad", loader )) ) if( !(class = vips_class_find( "VipsForeignLoad", loader )) )
@ -662,7 +662,7 @@ vips_foreign_is_a_buffer( const char *loader, const void *data, size_t size )
VipsForeignFlags VipsForeignFlags
vips_foreign_flags( const char *loader, const char *filename ) vips_foreign_flags( const char *loader, const char *filename )
{ {
VipsObjectClass *class; const VipsObjectClass *class;
if( (class = vips_class_find( "VipsForeignLoad", loader )) ) { if( (class = vips_class_find( "VipsForeignLoad", loader )) ) {
VipsForeignLoadClass *load_class = VipsForeignLoadClass *load_class =

View File

@ -77,7 +77,9 @@ typedef struct _VipsForeignClass {
} VipsForeignClass; } VipsForeignClass;
GType vips_foreign_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_foreign_get_type(void);
/* Map over and find formats. This uses type introspection to loop over /* Map over and find formats. This uses type introspection to loop over
* subclasses of VipsForeign. * subclasses of VipsForeign.
@ -211,7 +213,9 @@ typedef struct _VipsForeignLoadClass {
int (*load)( VipsForeignLoad *load ); int (*load)( VipsForeignLoad *load );
} VipsForeignLoadClass; } VipsForeignLoadClass;
GType vips_foreign_load_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_foreign_load_get_type(void);
const char *vips_foreign_find_load( const char *filename ); const char *vips_foreign_find_load( const char *filename );
const char *vips_foreign_find_load_buffer( const void *data, size_t size ); const char *vips_foreign_find_load_buffer( const void *data, size_t size );
@ -313,7 +317,9 @@ typedef struct _VipsForeignSaveClass {
gboolean coding[VIPS_CODING_LAST]; gboolean coding[VIPS_CODING_LAST];
} VipsForeignSaveClass; } VipsForeignSaveClass;
GType vips_foreign_save_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_foreign_save_get_type(void);
const char *vips_foreign_find_save( const char *filename ); const char *vips_foreign_find_save( const char *filename );
const char *vips_foreign_find_save_buffer( const char *suffix ); const char *vips_foreign_find_save_buffer( const char *suffix );

View File

@ -173,7 +173,7 @@ typedef struct _VipsProgress {
VIPS_TYPE_IMAGE, VipsImageClass )) VIPS_TYPE_IMAGE, VipsImageClass ))
typedef struct _VipsImage { typedef struct _VipsImage {
VipsObject parent_object; VipsObject parent_instance;
/*< private >*/ /*< private >*/
@ -356,7 +356,9 @@ typedef struct _VipsImageClass {
} VipsImageClass; } VipsImageClass;
GType vips_image_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_image_get_type(void);
/* Has to be guint64 and not size_t/off_t since we have to be able to address /* Has to be guint64 and not size_t/off_t since we have to be able to address
* huge images on platforms with 32-bit files. * huge images on platforms with 32-bit files.

View File

@ -87,7 +87,9 @@ typedef struct _VipsInterpolateClass {
int window_offset; int window_offset;
} VipsInterpolateClass; } VipsInterpolateClass;
GType vips_interpolate_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_interpolate_get_type(void);
void vips_interpolate( VipsInterpolate *interpolate, void vips_interpolate( VipsInterpolate *interpolate,
void *out, VipsRegion *in, double x, double y ); void *out, VipsRegion *in, double x, double y );
VipsInterpolateMethod vips_interpolate_get_method( VipsInterpolate *interpolate ); VipsInterpolateMethod vips_interpolate_get_method( VipsInterpolate *interpolate );

View File

@ -406,7 +406,7 @@ int vips_object_get_argument_priority( VipsObject *object, const char *name );
(G_TYPE_INSTANCE_GET_CLASS( (obj), VIPS_TYPE_OBJECT, VipsObjectClass )) (G_TYPE_INSTANCE_GET_CLASS( (obj), VIPS_TYPE_OBJECT, VipsObjectClass ))
struct _VipsObject { struct _VipsObject {
GObject parent_object; GObject parent_instance;
/* Set after ->build() has run succesfully: construct is fully done /* Set after ->build() has run succesfully: construct is fully done
* and checked. * and checked.
@ -579,7 +579,9 @@ void vips_object_print_name( VipsObject *object );
gboolean vips_object_sanity( VipsObject *object ); gboolean vips_object_sanity( VipsObject *object );
GType vips_object_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_object_get_type(void);
void vips_object_class_install_argument( VipsObjectClass *cls, void vips_object_class_install_argument( VipsObjectClass *cls,
GParamSpec *pspec, VipsArgumentFlags flags, GParamSpec *pspec, VipsArgumentFlags flags,

View File

@ -92,7 +92,9 @@ typedef struct _VipsOperationClass {
void (*invalidate)( VipsOperation *operation ); void (*invalidate)( VipsOperation *operation );
} VipsOperationClass; } VipsOperationClass;
GType vips_operation_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_operation_get_type(void);
VipsOperationFlags vips_operation_get_flags( VipsOperation *operation ); VipsOperationFlags vips_operation_get_flags( VipsOperation *operation );
void vips_operation_class_print_usage( VipsOperationClass *operation_class ); void vips_operation_class_print_usage( VipsOperationClass *operation_class );

View File

@ -98,7 +98,9 @@ typedef struct _VipsRegionClass {
} VipsRegionClass; } VipsRegionClass;
GType vips_region_get_type( void ); /* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_region_get_type(void);
VipsRegion *vips_region_new( VipsImage *image ); VipsRegion *vips_region_new( VipsImage *image );

View File

@ -97,7 +97,10 @@ typedef struct _VipsThreadStateClass {
} VipsThreadStateClass; } VipsThreadStateClass;
void *vips_thread_state_set( VipsObject *object, void *a, void *b ); void *vips_thread_state_set( VipsObject *object, void *a, void *b );
GType vips_thread_state_get_type( void );
/* Don't put spaces around void here, it breaks gtk-doc.
*/
GType vips_thread_state_get_type(void);
VipsThreadState *vips_thread_state_new( VipsImage *im, void *a ); VipsThreadState *vips_thread_state_new( VipsImage *im, void *a );

View File

@ -50,7 +50,7 @@ typedef struct _VipsThing {
* The #GType for a #VipsThing. * The #GType for a #VipsThing.
*/ */
#define VIPS_TYPE_THING (vips_thing_get_type()) #define VIPS_TYPE_THING (vips_thing_get_type())
GType vips_thing_get_type( void ); GType vips_thing_get_type(void);
VipsThing *vips_thing_new( int i ); VipsThing *vips_thing_new( int i );
/* A ref-counted area of memory. Can hold arrays of things as well. /* A ref-counted area of memory. Can hold arrays of things as well.
@ -119,7 +119,7 @@ void *vips_area_get_data( VipsArea *area,
*/ */
#define VIPS_TYPE_AREA (vips_area_get_type()) #define VIPS_TYPE_AREA (vips_area_get_type())
#define VIPS_AREA( X ) ((VipsArea *) (X)) #define VIPS_AREA( X ) ((VipsArea *) (X))
GType vips_area_get_type( void ); GType vips_area_get_type(void);
/** /**
* VIPS_TYPE_SAVE_STRING: * VIPS_TYPE_SAVE_STRING:
@ -127,7 +127,7 @@ GType vips_area_get_type( void );
* The #GType for a #VipsSaveString. * The #GType for a #VipsSaveString.
*/ */
#define VIPS_TYPE_SAVE_STRING (vips_save_string_get_type()) #define VIPS_TYPE_SAVE_STRING (vips_save_string_get_type())
GType vips_save_string_get_type( void ); GType vips_save_string_get_type(void);
/** /**
* VIPS_TYPE_REF_STRING: * VIPS_TYPE_REF_STRING:
@ -142,7 +142,7 @@ typedef struct _VipsRefString {
VipsRefString *vips_ref_string_new( const char *str ); VipsRefString *vips_ref_string_new( const char *str );
const char *vips_ref_string_get( VipsRefString *refstr, size_t *length ); const char *vips_ref_string_get( VipsRefString *refstr, size_t *length );
GType vips_ref_string_get_type( void ); GType vips_ref_string_get_type(void);
/** /**
* VIPS_TYPE_BLOB: * VIPS_TYPE_BLOB:
@ -159,7 +159,7 @@ VipsBlob *vips_blob_new( VipsCallbackFn free_fn,
const void *data, size_t size ); const void *data, size_t size );
VipsBlob *vips_blob_copy( const void *data, size_t size ); VipsBlob *vips_blob_copy( const void *data, size_t size );
const void *vips_blob_get( VipsBlob *blob, size_t *size ); const void *vips_blob_get( VipsBlob *blob, size_t *size );
GType vips_blob_get_type( void ); GType vips_blob_get_type(void);
/** /**
* VIPS_TYPE_ARRAY_DOUBLE: * VIPS_TYPE_ARRAY_DOUBLE:
@ -175,7 +175,7 @@ typedef struct _VipsArrayDouble {
VipsArrayDouble *vips_array_double_new( const double *array, int n ); VipsArrayDouble *vips_array_double_new( const double *array, int n );
VipsArrayDouble *vips_array_double_newv( int n, ... ); VipsArrayDouble *vips_array_double_newv( int n, ... );
double *vips_array_double_get( VipsArrayDouble *array, int *n ); double *vips_array_double_get( VipsArrayDouble *array, int *n );
GType vips_array_double_get_type( void ); GType vips_array_double_get_type(void);
/** /**
* VIPS_TYPE_ARRAY_INT: * VIPS_TYPE_ARRAY_INT:
@ -191,7 +191,7 @@ typedef struct _VipsArrayInt {
VipsArrayInt *vips_array_int_new( const int *array, int n ); VipsArrayInt *vips_array_int_new( const int *array, int n );
VipsArrayInt *vips_array_int_newv( int n, ... ); VipsArrayInt *vips_array_int_newv( int n, ... );
int *vips_array_int_get( VipsArrayInt *array, int *n ); int *vips_array_int_get( VipsArrayInt *array, int *n );
GType vips_array_int_get_type( void ); GType vips_array_int_get_type(void);
/** /**
* VIPS_TYPE_ARRAY_IMAGE: * VIPS_TYPE_ARRAY_IMAGE:
@ -207,7 +207,7 @@ typedef struct _VipsArrayImage {
/* See image.h for vips_array_image_new() etc., they need to be declared after /* See image.h for vips_array_image_new() etc., they need to be declared after
* VipsImage. * VipsImage.
*/ */
GType vips_array_image_get_type( void ); GType vips_array_image_get_type(void);
void vips_value_set_area( GValue *value, VipsCallbackFn free_fn, void *data ); void vips_value_set_area( GValue *value, VipsCallbackFn free_fn, void *data );
void *vips_value_get_area( const GValue *value, size_t *length ); void *vips_value_get_area( const GValue *value, size_t *length );