From 2427b2896c306f6a34f79dee92066ec4798d2a69 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Sat, 23 Jun 2012 10:30:48 +0100 Subject: [PATCH] slightly more memory debugging output regions now say if they have attached memory, images say what type (eg. partial etc) they are --- ChangeLog | 3 +++ configure.in | 4 ++-- libvips/iofuncs/image.c | 2 ++ libvips/iofuncs/region.c | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22a943fe..1727b4e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +18/6/12 started 7.28.9 +- slightly more memory debugging output + 18/6/12 started 7.28.8 - fixes for centos5 portability diff --git a/configure.in b/configure.in index 66000a4b..0369bab9 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # also update the version number in the m4 macros below -AC_INIT(vips, 7.28.8, vipsip@jiscmail.ac.uk) +AC_INIT(vips, 7.28.9, vipsip@jiscmail.ac.uk) # required for gobject-introspection AC_PREREQ(2.62) @@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([m4]) # user-visible library versioning m4_define([vips_major_version], [7]) m4_define([vips_minor_version], [28]) -m4_define([vips_micro_version], [8]) +m4_define([vips_micro_version], [9]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c index de8c2f99..62d7a09e 100644 --- a/libvips/iofuncs/image.c +++ b/libvips/iofuncs/image.c @@ -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 ); } diff --git a/libvips/iofuncs/region.c b/libvips/iofuncs/region.c index 1134ab48..f192e115 100644 --- a/libvips/iofuncs/region.c +++ b/libvips/iofuncs/region.c @@ -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 ); }