From 9c18f1b4d54e1036c00a1032a9b62b6b86ac7753 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Wed, 13 Jul 2016 22:39:16 +0100 Subject: [PATCH] yet mmore doc fixes classes are working again in gtk-doc, yay --- libvips/foreign/foreign.c | 6 +++--- libvips/include/vips/foreign.h | 12 +++++++++--- libvips/include/vips/image.h | 6 ++++-- libvips/include/vips/interpolate.h | 4 +++- libvips/include/vips/object.h | 6 ++++-- libvips/include/vips/operation.h | 4 +++- libvips/include/vips/region.h | 4 +++- libvips/include/vips/threadpool.h | 5 ++++- libvips/include/vips/type.h | 16 ++++++++-------- 9 files changed, 41 insertions(+), 22 deletions(-) diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c index 04fd4551..707a1ed9 100644 --- a/libvips/foreign/foreign.c +++ b/libvips/foreign/foreign.c @@ -609,7 +609,7 @@ vips_foreign_find_load_buffer( const void *data, size_t size ) gboolean vips_foreign_is_a( const char *loader, const char *filename ) { - VipsObjectClass *class; + const VipsObjectClass *class; VipsForeignLoadClass *load_class; if( !(class = vips_class_find( "VipsForeignLoad", loader )) ) @@ -636,7 +636,7 @@ vips_foreign_is_a( const char *loader, const char *filename ) gboolean vips_foreign_is_a_buffer( const char *loader, const void *data, size_t size ) { - VipsObjectClass *class; + const VipsObjectClass *class; VipsForeignLoadClass *load_class; 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 vips_foreign_flags( const char *loader, const char *filename ) { - VipsObjectClass *class; + const VipsObjectClass *class; if( (class = vips_class_find( "VipsForeignLoad", loader )) ) { VipsForeignLoadClass *load_class = diff --git a/libvips/include/vips/foreign.h b/libvips/include/vips/foreign.h index 14d9a824..2245167b 100644 --- a/libvips/include/vips/foreign.h +++ b/libvips/include/vips/foreign.h @@ -77,7 +77,9 @@ typedef struct _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 * subclasses of VipsForeign. @@ -211,7 +213,9 @@ typedef struct _VipsForeignLoadClass { int (*load)( VipsForeignLoad *load ); } 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_buffer( const void *data, size_t size ); @@ -313,7 +317,9 @@ typedef struct _VipsForeignSaveClass { gboolean coding[VIPS_CODING_LAST]; } 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_buffer( const char *suffix ); diff --git a/libvips/include/vips/image.h b/libvips/include/vips/image.h index ee8d7a6b..3fedba71 100644 --- a/libvips/include/vips/image.h +++ b/libvips/include/vips/image.h @@ -173,7 +173,7 @@ typedef struct _VipsProgress { VIPS_TYPE_IMAGE, VipsImageClass )) typedef struct _VipsImage { - VipsObject parent_object; + VipsObject parent_instance; /*< private >*/ @@ -356,7 +356,9 @@ typedef struct _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 * huge images on platforms with 32-bit files. diff --git a/libvips/include/vips/interpolate.h b/libvips/include/vips/interpolate.h index a872fb89..930e400e 100644 --- a/libvips/include/vips/interpolate.h +++ b/libvips/include/vips/interpolate.h @@ -87,7 +87,9 @@ typedef struct _VipsInterpolateClass { int window_offset; } 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 *out, VipsRegion *in, double x, double y ); VipsInterpolateMethod vips_interpolate_get_method( VipsInterpolate *interpolate ); diff --git a/libvips/include/vips/object.h b/libvips/include/vips/object.h index 53e16397..1da024fd 100644 --- a/libvips/include/vips/object.h +++ b/libvips/include/vips/object.h @@ -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 )) struct _VipsObject { - GObject parent_object; + GObject parent_instance; /* Set after ->build() has run succesfully: construct is fully done * and checked. @@ -579,7 +579,9 @@ void vips_object_print_name( 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, GParamSpec *pspec, VipsArgumentFlags flags, diff --git a/libvips/include/vips/operation.h b/libvips/include/vips/operation.h index 3b732f6e..d76abdaa 100644 --- a/libvips/include/vips/operation.h +++ b/libvips/include/vips/operation.h @@ -92,7 +92,9 @@ typedef struct _VipsOperationClass { void (*invalidate)( VipsOperation *operation ); } 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 ); void vips_operation_class_print_usage( VipsOperationClass *operation_class ); diff --git a/libvips/include/vips/region.h b/libvips/include/vips/region.h index 5c9439d4..ce171a39 100644 --- a/libvips/include/vips/region.h +++ b/libvips/include/vips/region.h @@ -98,7 +98,9 @@ typedef struct _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 ); diff --git a/libvips/include/vips/threadpool.h b/libvips/include/vips/threadpool.h index 2352bc44..d1e49ce4 100644 --- a/libvips/include/vips/threadpool.h +++ b/libvips/include/vips/threadpool.h @@ -97,7 +97,10 @@ typedef struct _VipsThreadStateClass { } VipsThreadStateClass; 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 ); diff --git a/libvips/include/vips/type.h b/libvips/include/vips/type.h index 37ed6b3c..88b44c88 100644 --- a/libvips/include/vips/type.h +++ b/libvips/include/vips/type.h @@ -50,7 +50,7 @@ typedef struct _VipsThing { * The #GType for a #VipsThing. */ #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 ); /* 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_AREA( X ) ((VipsArea *) (X)) -GType vips_area_get_type( void ); +GType vips_area_get_type(void); /** * VIPS_TYPE_SAVE_STRING: @@ -127,7 +127,7 @@ GType vips_area_get_type( void ); * The #GType for a #VipsSaveString. */ #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: @@ -142,7 +142,7 @@ typedef struct _VipsRefString { VipsRefString *vips_ref_string_new( const char *str ); 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: @@ -159,7 +159,7 @@ VipsBlob *vips_blob_new( VipsCallbackFn free_fn, 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 ); -GType vips_blob_get_type( void ); +GType vips_blob_get_type(void); /** * 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_newv( 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: @@ -191,7 +191,7 @@ typedef struct _VipsArrayInt { VipsArrayInt *vips_array_int_new( const int *array, int n ); VipsArrayInt *vips_array_int_newv( 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: @@ -207,7 +207,7 @@ typedef struct _VipsArrayImage { /* See image.h for vips_array_image_new() etc., they need to be declared after * 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_get_area( const GValue *value, size_t *length );