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

stuff

Browse Source
This commit is contained in:
John Cupitt 2007-11-07 23:41:08 +00:00
parent 954b491745
commit ff4b67b642
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/vips/threadgroup.h
View File

@ -98,6 +98,8 @@ typedef struct im__threadgroup_t {
#endif /*DEBUG_HIGHWATER*/ #endif /*DEBUG_HIGHWATER*/
int kill; /* Set this to stop threadgroup early */ int kill; /* Set this to stop threadgroup early */
int progress; /* Set this to get eval progress feedback */
} im_threadgroup_t; } im_threadgroup_t;
void im_concurrency_set( int concurrency ); void im_concurrency_set( int concurrency );

11
libsrc/iofuncs/im_generate.c
View File

@ -253,10 +253,6 @@ eval_to_region( REGION *or, im_threadgroup_t *tg )
thr->y = clipped.top; thr->y = clipped.top;
im_threadgroup_trigger( thr ); im_threadgroup_trigger( thr );
/* Trigger any eval callbacks on our source image.
*/
im__handle_eval( tg->im, tg->pw, tg->ph );
/* Check for errors. /* Check for errors.
*/ */
if( im_threadgroup_iserror( tg ) ) { if( im_threadgroup_iserror( tg ) ) {
@ -316,7 +312,7 @@ eval_to_memory( im_threadgroup_t *tg, REGION *or )
pos.left = 0; pos.left = 0;
pos.top = y; pos.top = y;
pos.width = im->Xsize; pos.width = im->Xsize;
pos.height = chunk; pos.height = IM_MIN( chunk, im->Ysize - y );
if( (result = im_region_image( or, &pos )) ) if( (result = im_region_image( or, &pos )) )
break; break;
@ -325,6 +321,11 @@ eval_to_memory( im_threadgroup_t *tg, REGION *or )
if( (result = eval_to_region( or, tg )) ) if( (result = eval_to_region( or, tg )) )
break; break;
/* Trigger any eval callbacks on our source image.
*/
if( (result = im__handle_eval( im, pos.width, pos.height )) )
break;
#ifdef DEBUG_IO #ifdef DEBUG_IO
ntiles++; ntiles++;
#endif /*DEBUG_IO*/ #endif /*DEBUG_IO*/