From a3b226aa9bef2d2287d7abfef1d408a08f52f82f Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Wed, 2 Aug 2017 10:40:17 +0100 Subject: [PATCH 1/3] version bump --- ChangeLog | 2 ++ configure.ac | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 886585af..b77e5b58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +2/8/17 started 8.5.8 + 9/6/17 started 8.5.7 - better smartcrop - transform cmyk->rgb automatically on write if there's an embedded profile diff --git a/configure.ac b/configure.ac index a833f0ed..dbb76ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # also update the version number in the m4 macros below -AC_INIT([vips], [8.5.7], [vipsip@jiscmail.ac.uk]) +AC_INIT([vips], [8.5.8], [vipsip@jiscmail.ac.uk]) # required for gobject-introspection AC_PREREQ(2.62) @@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4]) # user-visible library versioning m4_define([vips_major_version], [8]) m4_define([vips_minor_version], [5]) -m4_define([vips_micro_version], [7]) +m4_define([vips_micro_version], [8]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) @@ -38,7 +38,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date` # binary interface changes not backwards compatible?: reset age to 0 LIBRARY_CURRENT=49 -LIBRARY_REVISION=6 +LIBRARY_REVISION=7 LIBRARY_AGE=7 # patched into include/vips/version.h From 58f975746789a0f0ee509ab7c787d66a3a09991b Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Wed, 2 Aug 2017 10:41:10 +0100 Subject: [PATCH 2/3] fix transparency detection in merge a typo meant we were just testing the first band for zero, not all three thanks Haida! --- ChangeLog | 1 + libvips/mosaicing/im_lrmerge.c | 2 +- libvips/mosaicing/im_tbmerge.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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; \ From 7c8bcff110dc8f6ca6d75e5e8f8e3b967efce7b5 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Wed, 2 Aug 2017 10:56:34 +0100 Subject: [PATCH 3/3] heh oops try again --- libvips/mosaicing/im_lrmerge.c | 2 +- libvips/mosaicing/im_tbmerge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvips/mosaicing/im_lrmerge.c b/libvips/mosaicing/im_lrmerge.c index f36dee40..cdb012cc 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[ii] ) \ + if( tt[i + ii] ) \ break; \ if( ii == cb ) \ (RESULT) = 1; \ diff --git a/libvips/mosaicing/im_tbmerge.c b/libvips/mosaicing/im_tbmerge.c index 26af4ef9..09afb6ff 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[ii] ) \ + if( tt[i + ii] ) \ break; \ if( ii == cb ) \ (RESULT) = 1; \