diff --git a/ChangeLog b/ChangeLog index b77e5b58..6f1002a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 2/8/17 started 8.5.8 +- fix transparency detection in merge, thanks Haida 9/6/17 started 8.5.7 - better smartcrop diff --git a/libvips/mosaicing/im_lrmerge.c b/libvips/mosaicing/im_lrmerge.c index 5ce599ea..f36dee40 100644 --- a/libvips/mosaicing/im_lrmerge.c +++ b/libvips/mosaicing/im_lrmerge.c @@ -392,7 +392,7 @@ make_firstlast( MergeInfo *inf, Overlapping *ovlap, Rect *oreg ) int ii; \ \ for( ii = 0; ii < cb; ii++ ) \ - if( tt[i] ) \ + if( tt[ii] ) \ break; \ if( ii == cb ) \ (RESULT) = 1; \ diff --git a/libvips/mosaicing/im_tbmerge.c b/libvips/mosaicing/im_tbmerge.c index 38079b25..26af4ef9 100644 --- a/libvips/mosaicing/im_tbmerge.c +++ b/libvips/mosaicing/im_tbmerge.c @@ -335,7 +335,7 @@ make_firstlast( MergeInfo *inf, Overlapping *ovlap, Rect *oreg ) int ii; \ \ for( ii = 0; ii < cb; ii++ ) \ - if( tt[i] ) \ + if( tt[ii] ) \ break; \ if( ii == cb ) \ (RESULT) = 1; \