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

lock progress to 100% on posteval

Browse Source 
Because signals can be delayed, progress isn't always 100% in posteval.
Lock it to 100%.

See https://github.com/libvips/libvips/issues/2820
This commit is contained in:
John Cupitt 2022-05-23 19:27:40 +01:00
parent a9bfd508f5
commit 111eef0049
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libvips/iofuncs/image.c
View File

@ -1582,11 +1582,26 @@ vips_image_posteval( VipsImage *image )
{ {
if( image->progress_signal && if( image->progress_signal &&
image->progress_signal->time ) { image->progress_signal->time ) {
gint64 processed;
VIPS_DEBUG_MSG( "vips_image_posteval: %p\n", image ); VIPS_DEBUG_MSG( "vips_image_posteval: %p\n", image );
g_assert( vips_object_sanity( g_assert( vips_object_sanity(
VIPS_OBJECT( image->progress_signal ) ) ); VIPS_OBJECT( image->progress_signal ) ) );
/* Make sure posteval sees a finished progress.
*/
processed = image->time->tpels;
vips_progress_update( image->time, processed );
/* For vips7 compat, update the ->time on the signalling image
* too, even though it may have a different width/height to
* the image we are actually generating.
*/
if( image->progress_signal->time != image->time )
vips_progress_update( image->progress_signal->time,
processed );
if( !vips_image_get_typeof( image, "hide-progress" ) ) if( !vips_image_get_typeof( image, "hide-progress" ) )
g_signal_emit( image->progress_signal, g_signal_emit( image->progress_signal,
vips_image_signals[SIG_POSTEVAL], 0, vips_image_signals[SIG_POSTEVAL], 0,