From 328cda82c5afdab007168d16869a53d628dcc5f9 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 24 Nov 2014 12:19:44 +0000 Subject: [PATCH] Updates for 7.42 stable release of libvips --- README.md | 4 ++-- preinstall.sh | 6 +++--- src/resize.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 32b75ad3..710d739b 100755 --- a/README.md +++ b/README.md @@ -404,9 +404,9 @@ An advanced setting for the _zlib_ compression level of the lossless PNG output #### withoutAdaptiveFiltering() -_Requires libvips 7.41.0+_ +_Requires libvips 7.42.0+_ -An advanced and experimental PNG output setting to disable adaptive row filtering. +An advanced setting to disable adaptive row filtering for the lossless PNG output format. ### Output methods diff --git a/preinstall.sh b/preinstall.sh index e051694d..ebf29cea 100755 --- a/preinstall.sh +++ b/preinstall.sh @@ -12,15 +12,15 @@ # * Fedora 21, 22 vips_version_minimum=7.40.0 -vips_version_latest_major=7.40 -vips_version_latest_minor=11 +vips_version_latest_major=7.42 +vips_version_latest_minor=0 install_libvips_from_source() { echo "Compiling libvips $vips_version_latest_major.$vips_version_latest_minor from source" curl -O http://www.vips.ecs.soton.ac.uk/supported/$vips_version_latest_major/vips-$vips_version_latest_major.$vips_version_latest_minor.tar.gz tar zvxf vips-$vips_version_latest_major.$vips_version_latest_minor.tar.gz cd vips-$vips_version_latest_major.$vips_version_latest_minor - ./configure --enable-debug=no --enable-docs=no --enable-cxx=yes --without-python --without-orc --without-fftw $1 + ./configure --enable-debug=no --enable-docs=no --enable-cxx=yes --without-python --without-orc --without-fftw --without-gsf $1 make make install cd .. diff --git a/src/resize.cc b/src/resize.cc index b541ecdb..41ecbc60 100755 --- a/src/resize.cc +++ b/src/resize.cc @@ -609,7 +609,7 @@ class ResizeWorker : public NanAsyncWorker { } baton->outputFormat = "jpeg"; } else if (baton->output == "__png" || (baton->output == "__input" && inputImageType == ImageType::PNG)) { -#if (VIPS_MAJOR_VERSION >= 7 && VIPS_MINOR_VERSION >= 41) +#if (VIPS_MAJOR_VERSION >= 7 && VIPS_MINOR_VERSION >= 42) // Select PNG row filter int filter = baton->withoutAdaptiveFiltering ? VIPS_FOREIGN_PNG_FILTER_NONE : VIPS_FOREIGN_PNG_FILTER_ALL; // Write PNG to buffer