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

fix crash in nip2 make check

Browse Source 
fully init region before we go parallel.
This commit is contained in:
John Cupitt 2011-03-14 15:59:33 +00:00
parent 3244d8f392
commit 4cdd5640ea
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libvips/iofuncs/init.c
View File

@ -21,6 +21,9 @@
* - load plugins from libdir/vips-x.x * - load plugins from libdir/vips-x.x
* 5/10/09 * 5/10/09
* - gtkdoc comments * - gtkdoc comments
* 14/3/10
* - init image and region before we start, we need all types to be fully
* constructed before we go parallel
*/ */
/* /*
@ -160,6 +163,8 @@ vips_init( const char *argv0 )
const char *prefix; const char *prefix;
const char *libdir; const char *libdir;
char name[256]; char name[256];
VipsImage *image;
VipsRegion *region;
/* Two stage done handling: 'done' means we've completed, 'started' /* Two stage done handling: 'done' means we've completed, 'started'
* means we're currently initialising. Use this to prevent recursive * means we're currently initialising. Use this to prevent recursive
@ -214,6 +219,15 @@ vips_init( const char *argv0 )
im__format_init(); im__format_init();
vips__interpolate_init(); vips__interpolate_init();
/* We make regions in parallel, so we have to be careful that any
* associated types are fully built before we start. We can't init the
* clases in two separate threads.
*/
image = vips_image_new( "p" );
region = vips_region_new( image );
g_object_unref( region );
g_object_unref( image );
/* Load up any plugins in the vips libdir. We don't error on failure, /* Load up any plugins in the vips libdir. We don't error on failure,
* it's too annoying to have VIPS refuse to start because of a broken * it's too annoying to have VIPS refuse to start because of a broken
* plugin. * plugin.