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

nope, revert

Browse Source 
it's not possible to get inisert to trigger minimise reliably, since
threads can be out of order in the middle of the pipeline

we need to add minimise on Y (as before) to get reliable behaviour for
this case
This commit is contained in:
John Cupitt 2019-07-27 17:35:34 +01:00
parent 7f08e8fd28
commit 55ae22608f
1 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
libvips/conversion/insert.c
View File

@ -28,8 +28,6 @@
* 29/9/11
* - rewrite as a class
* - add expand, bg options
* 27/7/19
* - minimise sub when we're done with it
*/
/*
@ -170,8 +168,6 @@ vips__insert_paste_region( VipsRegion *or, VipsRegion *ir, VipsRect *pos )
return( 0 );
}
/* Insert generate function.
*/
static int
vips_insert_gen( VipsRegion *or, void *seq, void *a, void *b, gboolean *stop )
{
@ -181,51 +177,43 @@ vips_insert_gen( VipsRegion *or, void *seq, void *a, void *b, gboolean *stop )
VipsRect ovl;
/* Does the rect we have been asked for fall entirely inside the
* sub-image?
*/
if( vips_rect_includesrect( &insert->rsub, &or->valid ) )
return( vips__insert_just_one( or, ir[1],
insert->rsub.left, insert->rsub.top ) );
/* Does it fall entirely inside the main, and not at all inside the
* sub?
/* The part of the subimage we will use.
*/
vips_rect_intersectrect( &or->valid, &insert->rsub, &ovl );
if( vips_rect_includesrect( &insert->rmain, &or->valid ) &&
vips_rect_isempty( &ovl ) ) {
/* If we're now below the sub-image, and we're in sequential
* mode, and we've not minimised it before, we can shut down
* that input.
*/
if( vips_image_is_sequential( insert->sub ) &&
r->top > VIPS_RECT_BOTTOM( &insert->rsub ) &&
!insert->sub_minimised ) {
insert->sub_minimised = TRUE;
vips_image_minimise_all( insert->sub );
}
return( vips__insert_just_one( or, ir[0],
insert->rmain.left, insert->rmain.top ) );
/* Three cases: we are generating entirely within the sub-image,
* entirely within the main image, or a mixture.
*/
if( vips_rect_includesrect( &insert->rsub, &or->valid ) ) {
if( vips__insert_just_one( or, ir[1],
insert->rsub.left, insert->rsub.top ) )
return( -1 );
}
else if( vips_rect_includesrect( &insert->rmain, &or->valid ) &&
vips_rect_isempty( &ovl ) ) {
if( vips__insert_just_one( or, ir[0],
insert->rmain.left, insert->rmain.top ) )
return( -1 );
}
else {
/* Output requires both (or neither) input. If it is not
* entirely inside both the main and the sub, then there is
* going to be some background.
*/
if( !(vips_rect_includesrect( &insert->rsub, &or->valid ) &&
vips_rect_includesrect( &insert->rmain, &or->valid )) )
vips_region_paint_pel( or, r, insert->ink );
/* Output requires both (or neither) input. If it is not entirely
* inside both the main and the sub, then there is going to be some
* background.
*/
if( !(vips_rect_includesrect( &insert->rsub, &or->valid ) &&
vips_rect_includesrect( &insert->rmain, &or->valid )) )
vips_region_paint_pel( or, r, insert->ink );
/* Paste from main.
*/
if( vips__insert_paste_region( or, ir[0], &insert->rmain ) )
return( -1 );
/* Paste from main.
*/
if( vips__insert_paste_region( or, ir[0], &insert->rmain ) )
return( -1 );
/* Paste from sub.
*/
if( vips__insert_paste_region( or, ir[1], &insert->rsub ) )
return( -1 );
/* Paste from sub.
*/
if( vips__insert_paste_region( or, ir[1], &insert->rsub ) )
return( -1 );
}
return( 0 );
}