sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vips_class_map_all() was broken

Browse Source
This commit is contained in:
John Cupitt 2011-10-11 21:09:39 +01:00
parent ffe4483030
commit 122c390c7b
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
- fallback vips_init() - fallback vips_init()
- im_openout() compat stub was wrong, breaking ruby-vips - im_openout() compat stub was wrong, breaking ruby-vips
- vips_class_map_concrete_all() needed a compat macro too - vips_class_map_concrete_all() needed a compat macro too
- vips_class_map_all() was broken
10/8/11 started 7.26.3 10/8/11 started 7.26.3
- don't use G_VALUE_COLLECT_INIT(), many platforms do not have a glib this - don't use G_VALUE_COLLECT_INIT(), many platforms do not have a glib this

20
libvips/iofuncs/object.c
View File

@ -1598,14 +1598,22 @@ vips_class_map_all( GType type, VipsClassMap fn, void *a )
{ {
void *result; void *result;
/* We never unref this ref, but we never unload classes /* We can't instantiate abstract classes.
* anyway, so so what.
*/ */
if( !(result = fn( VIPS_OBJECT_CLASS( g_type_class_ref( type ) ), a )) ) if( !G_TYPE_IS_ABSTRACT( type ) ) {
result = vips_type_map( type, /* We never unref this ref, but we never unload classes
(VipsTypeMap2) vips_class_map_all, fn, a ); * anyway, so so what.
*/
if( (result = fn(
VIPS_OBJECT_CLASS( g_type_class_ref( type ) ), a )) )
return( result );
}
return( result ); if( (result = vips_type_map( type,
(VipsTypeMap2) vips_class_map_all, fn, a )) )
return( result );
return( NULL );
} }
/* How deeply nested is a class ... used to indent class lists. /* How deeply nested is a class ... used to indent class lists.