Merge branch 'master' of github.com:jcupitt/libvips

This commit is contained in:
John Cupitt 2015-01-30 21:20:48 +00:00
commit fb82a1d72a
2 changed files with 5 additions and 3 deletions

View File

@ -1675,7 +1675,7 @@ vips_image_temp_name( void )
* vips_image_write_line(). Write a whole image to another image with
* vips_image_write().
*
* Returns: the new #VipsImage, or %NULL on error.
* Returns: (transfer full): the new #VipsImage, or %NULL on error.
*/
VipsImage *
vips_image_new( void )

View File

@ -1478,8 +1478,10 @@ vips_object_real_summary( VipsObject *object, VipsBuf *buf )
static void
vips_object_real_dump( VipsObject *object, VipsBuf *buf )
{
vips_buf_appendf( buf, " %s (%p)",
G_OBJECT_TYPE_NAME( object ), object );
vips_buf_appendf( buf, " %s (%p) count=%d",
G_OBJECT_TYPE_NAME( object ),
object,
G_OBJECT( object )->ref_count );
if( object->local_memory )
vips_buf_appendf( buf, " %zd bytes", object->local_memory );