Merge remote-tracking branch 'origin/7.28'

Conflicts:
	ChangeLog
	configure.in
This commit is contained in:
John Cupitt 2012-06-23 10:32:36 +01:00
commit 49fbfdd454
3 changed files with 8 additions and 0 deletions

View File

@ -8,6 +8,9 @@
- vipsthumbnail no longer removes profiles by default
- much more gentle sharpening in thumbnails
18/6/12 started 7.28.9
- slightly more memory debugging output
18/6/12 started 7.28.8
- fixes for centos5 portability

View File

@ -414,6 +414,8 @@ vips_image_summary( VipsObject *object, VipsBuf *buf )
vips_enum_nick( VIPS_TYPE_CODING,
vips_image_get_coding( image ) ) );
}
vips_buf_appendf( buf, ", %s",
vips_enum_nick( VIPS_TYPE_IMAGE_TYPE, image->dtype ) );
VIPS_OBJECT_CLASS( vips_image_parent_class )->summary( object, buf );
}

View File

@ -323,6 +323,9 @@ vips_region_summary( VipsObject *object, VipsBuf *buf )
vips_buf_appendf( buf, "width = %d, ", region->valid.width );
vips_buf_appendf( buf, "height = %d", region->valid.height );
if( region->buffer && region->buffer->buf )
vips_buf_appendf( buf, ", bytes = %zd", region->buffer->bsize );
VIPS_OBJECT_CLASS( vips_region_parent_class )->summary( object, buf );
}