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

oops, failed merge

Browse Source
This commit is contained in:
John Cupitt 2016-10-28 17:26:13 +01:00
parent ad5ceec322
commit 87928d4eba
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvips/iofuncs/buffer.c
View File

@ -671,9 +671,6 @@ vips__buffer_init( void )
if( buffer_cache_max_reserve < 1 )
printf( "vips__buffer_init: buffer reserve disabled\n" );
if( !vips_thread_isworker() )
printf( "vips__buffer_init: called for non-worker\n" );
#ifdef DEBUG
printf( "vips__buffer_init: DEBUG enabled\n" );
#endif /*DEBUG*/

8
libvips/iofuncs/threadpool.c
View File

@ -186,18 +186,14 @@ vips_thread_run( gpointer data )
void *result;
/* Set this to something (anything) to tag this thread as a vips worker.
/* Set this to something (anything) to tag this thread as a vips
* worker.
*/
g_private_set( is_worker_key, data );
if( vips__thread_profile )
vips__thread_profile_attach( info->domain );
if( vips__thread_profile )
vips__thread_profile_attach( info->domain );
vips__buffer_init();
result = info->func( info->data );
g_free( info );