From 2912787f9d691078a1a2d0c9f64b22c8b98af597 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 5 Sep 2022 10:01:37 +0100 Subject: [PATCH 1/4] version bump for 8.13.2 --- ChangeLog | 3 +++ configure.ac | 6 +++--- meson.build | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2f39455..439a3822 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +head of 8.13 +- in dzsave, add add missing include directive for errno/EEXIST [kleisauke] + 24/7/22 started 8.13.1 - fix im7 feature detection in meson - add a summary table at the end of configure in meson diff --git a/configure.ac b/configure.ac index 3573a76e..8cf7d5fa 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.13.1], [vipsip@jiscmail.ac.uk]) +AC_INIT([vips], [8.13.2], [vipsip@jiscmail.ac.uk]) # required for gobject-introspection AC_PREREQ([2.69]) @@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4]) # user-visible library versioning m4_define([vips_major_version], [8]) m4_define([vips_minor_version], [13]) -m4_define([vips_micro_version], [1]) +m4_define([vips_micro_version], [2]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) @@ -41,7 +41,7 @@ VIPS_LIBS="" # binary interface changed: increment current, reset revision to 0 # binary interface changes backwards compatible?: increment age # binary interface changes not backwards compatible?: reset age to 0 -LIBRARY_REVISION=1 +LIBRARY_REVISION=2 LIBRARY_CURRENT=57 LIBRARY_AGE=15 diff --git a/meson.build b/meson.build index 1040b6a8..3bed4e0e 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('vips', 'c', 'cpp', - version: '8.13.1', + version: '8.13.2', meson_version: '>=0.56', default_options: [ # this is what glib uses (one of our required deps), so we use it too @@ -21,7 +21,7 @@ version_patch = version_parts[2] # binary interface changes not backwards compatible?: reset age to 0 library_current = 57 library_age = 15 -library_revision = 1 +library_revision = 2 library_version = '@0@.@1@.@2@'.format(library_current - library_age, library_age, library_revision) darwin_versions = [library_current + 1, '@0@.@1@'.format(library_current + 1, library_revision)] From fc01771454b7ac97a748659b5cc3d1588616f328 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 5 Sep 2022 10:02:27 +0100 Subject: [PATCH 2/4] fix changelog layout --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 439a3822..c22db312 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -head of 8.13 +5/9/22 started 8.13.2 - in dzsave, add add missing include directive for errno/EEXIST [kleisauke] 24/7/22 started 8.13.1 From b58b7bd416a34c299d2b367098a2ce6e1d968077 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 8 Sep 2022 09:10:02 +0100 Subject: [PATCH 3/4] pngsave: ensure 8-bit palette images can be created (#3031) --- libvips/foreign/pngsave.c | 6 +++--- libvips/foreign/spngsave.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libvips/foreign/pngsave.c b/libvips/foreign/pngsave.c index 2b9711f5..eea9966e 100644 --- a/libvips/foreign/pngsave.c +++ b/libvips/foreign/pngsave.c @@ -145,9 +145,9 @@ vips_foreign_save_png_build( VipsObject *object ) png->bitdepth < 8 ) png->palette = TRUE; - /* Disable palettization for >8 bit save. - */ - if( png->bitdepth >= 8 ) + /* Disable palettization for >8 bit save. + */ + if( png->bitdepth > 8 ) png->palette = FALSE; if( vips__png_write_target( in, png->target, diff --git a/libvips/foreign/spngsave.c b/libvips/foreign/spngsave.c index 7ff47739..a40be6e4 100644 --- a/libvips/foreign/spngsave.c +++ b/libvips/foreign/spngsave.c @@ -613,9 +613,9 @@ vips_foreign_save_spng_build( VipsObject *object ) spng->bitdepth < 8 ) spng->palette = TRUE; - /* Disable palettization for >8 bit save. - */ - if( spng->bitdepth >= 8 ) + /* Disable palettization for >8 bit save. + */ + if( spng->bitdepth > 8 ) spng->palette = FALSE; if( vips_foreign_save_spng_write( spng, in ) ) { From 0e7c7a9a13798f9c4ab2ab0cdffcf940468d207a Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 8 Sep 2022 09:12:27 +0100 Subject: [PATCH 4/4] note palette save fix --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index c22db312..e14046b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 5/9/22 started 8.13.2 - in dzsave, add add missing include directive for errno/EEXIST [kleisauke] +- fix 8 bit pallete PNG save [lovell] 24/7/22 started 8.13.1 - fix im7 feature detection in meson