Merge remote-tracking branch 'origin/7.28'

This commit is contained in:
John Cupitt 2012-06-09 10:37:30 +01:00
commit 0e9b2e3168
2 changed files with 20 additions and 0 deletions

View File

@ -14,6 +14,7 @@
- add "nocache" operation flag, set for sequential load (thanks Diuming) - add "nocache" operation flag, set for sequential load (thanks Diuming)
- fix a crash in the tiff reader for huge values of RowsPerStrip (thanks - fix a crash in the tiff reader for huge values of RowsPerStrip (thanks
Nicolas) Nicolas)
- remove use of G_DEFINE_BOXED_TYPE() to help compat (thanks Jake)
19/4/12 started 7.28.5 19/4/12 started 7.28.5
- ifthenelse blend mode was broken - ifthenelse blend mode was broken

View File

@ -101,10 +101,29 @@ vips_thing_get_i( VipsThing *thing )
return( thing->i ); return( thing->i );
} }
/*
* glib-2.26+ only
G_DEFINE_BOXED_TYPE( VipsThing, vips_thing, G_DEFINE_BOXED_TYPE( VipsThing, vips_thing,
(GBoxedCopyFunc) vips_thing_copy, (GBoxedCopyFunc) vips_thing_copy,
(GBoxedFreeFunc) vips_thing_free ); (GBoxedFreeFunc) vips_thing_free );
*/
GType
vips_thing_get_type( void )
{
static GType type = 0;
if( !type ) {
type = g_boxed_type_register_static( "VipsThing",
(GBoxedCopyFunc) vips_thing_copy,
(GBoxedFreeFunc) vips_thing_free );
}
return( type );
}
/** /**
* SECTION: VipsArea * SECTION: VipsArea
* @short_description: an area of memory * @short_description: an area of memory