Update changelog for v0.11.1

Version bumps for benchmark test
Add test case for enlarge+embed combo #243
2026-02-05 22:26:20 +01:00 · 2015-08-12 09:49:50 +01:00 · 2015-08-12 09:26:38 +01:00 · 2015-08-12 07:25:14 +01:00 · 2015-08-11 21:51:22 +01:00 · 2015-07-31 12:11:18 +01:00
17 changed files with 315 additions and 283 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2014 CTP4
+os: Visual Studio 2015
 version: "{build}"
 build: off
 platform: x64
--- a/binding.gyp
+++ b/binding.gyp
@@ -74,6 +74,15 @@
      'VCCLCompilerTool': {
        'ExceptionHandling': 1 # /EHsc
      }
-    }
+    },
+    'configurations': {
+      'Release': {
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'ExceptionHandling': 1,
+          }
+        }
+      }
+    },
  }]
 }
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -2,6 +2,16 @@

 ### v0.11 - "*knife*"

+#### v0.11.1 - 12<sup>th</sup> August 2015
+
+* Silence MSVC warning: "C4530: C++ exception handler used, but unwind semantics are not enabled".
+  [#244](https://github.com/lovell/sharp/pull/244)
+  [@TheThing](https://github.com/TheThing)
+
+* Suppress gamma correction for input image with alpha transparency.
+  [#249](https://github.com/lovell/sharp/issues/249)
+  [@compeak](https://github.com/compeak)
+
 #### v0.11.0 - 15<sup>th</sup> July 2015

 * Allow alpha transparency compositing via new `overlayWith` method.
--- a/docs/install.md
+++ b/docs/install.md
@@ -25,7 +25,6 @@ libvips and its dependencies on the following Operating Systems:
 * Fedora 21, 22
 * Amazon Linux 2014.09, 2015.03
 * OpenSuse 13
-* Mac OS

 run the following as a user with `sudo` access:

@@ -47,11 +46,31 @@ Add `--with-openslide` to enable OpenSlide support:
 curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash -s -- --with-openslide
 ```

+#### Ubuntu LTS
+
+libvips v7.40.6 is available via a PPA.
+
+##### 12.04
+
+```sh
+sudo add-apt-repository -y ppa:lovell/precise-backport-vips
+sudo apt-get update
+sudo apt-get install -y libvips-dev libgsf-1-dev
+```
+
+##### 14.04
+
+```sh
+sudo add-apt-repository -y ppa:lovell/trusty-backport-vips
+sudo apt-get update
+sudo apt-get install -y libvips-dev libgsf-1-dev
+```
+
 ### Mac OS

 [![OS X 10.9.5 Build Status](https://travis-ci.org/lovell/sharp-osx-ci.png?branch=master)](https://travis-ci.org/lovell/sharp-osx-ci)

-Manual install via homebrew:
+Install libvips via homebrew:

 ```sh
 brew install homebrew/science/vips --with-webp --with-graphicsmagick
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -4,11 +4,11 @@ repo_url: https://github.com/lovell/sharp
 site_description: The fastest Node.js module for resizing JPEG, PNG, WebP and TIFF images. Uses the libvips library.
 copyright: <a href="https://dimens.io/">dimens.io</a>
 google_analytics: ['UA-13034748-12', 'sharp.dimens.io']
-theme: flatly
-dev_addr: 0.0.0.0:10101
+theme: readthedocs
 markdown_extensions:
  - toc:
-      permalink: " ♯"
+      permalink: True
+dev_addr: 0.0.0.0:10101
 pages:
  - Home: index.md
  - Installation: install.md
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sharp",
-  "version": "0.11.0",
+  "version": "0.11.1",
  "author": "Lovell Fuller <npm@lovell.info>",
  "contributors": [
    "Pierre Inglebert <pierre.inglebert@gmail.com>",
@@ -51,7 +51,7 @@
    "semver": "^5.0.1"
  },
  "devDependencies": {
-    "async": "^1.3.0",
+    "async": "^1.4.2",
    "coveralls": "^2.11.2",
    "exif-reader": "1.0.0",
    "icc": "^0.0.2",
--- a/preinstall.sh
+++ b/preinstall.sh
@@ -2,7 +2,6 @@

 # Ensures libvips is installed and attempts to install it if not
 # Currently supports:
-# * Mac OS
 # * Debian Linux
 #   * Debian 7, 8
 #   * Ubuntu 12.04, 14.04, 14.10, 15.04
@@ -10,7 +9,7 @@
 # * Red Hat Linux
 #   * RHEL/Centos/Scientific 6, 7
 #   * Fedora 21, 22
-#   * Amazon Linux 2014.09
+#   * Amazon Linux 2014.09, 2015.03

 vips_version_minimum=7.40.0
 vips_version_latest_major_minor=8.0
@@ -55,8 +54,7 @@ sorry() {
  exit 1
 }

-pkg_config_path_homebrew=`which brew >/dev/null 2>&1 && eval $(brew --env) && echo $PKG_CONFIG_LIBDIR || true`
-pkg_config_path="$pkg_config_path_homebrew:$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig"
+pkg_config_path="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig"

 check_if_library_exists() {
  PKG_CONFIG_PATH=$pkg_config_path pkg-config --exists $1
@@ -122,243 +120,205 @@ fi
 # OS-specific installations of libopenslide follows
 # Either openslide does not exist, or vips is installed without openslide support
 if [ $enable_openslide -eq 1 ] && [ -z $vips_with_openslide ] && [ $openslide_exists -eq 0 ]; then
-  case $(uname -s) in
-    *[Dd]arwin*)
-      # Mac OS
-      echo "Detected Mac OS"
-      if type "brew" > /dev/null; then
-        echo "Installing libopenslide via homebrew"
-        brew install openslide
-      elif type "port" > /dev/null; then
-        echo "Installing libopenslide via MacPorts"
-        port install openslide
-      else
-        sorry "openslide" "Mac OS without homebrew or MacPorts"
-      fi
+  if [ -f /etc/debian_version ]; then
+    # Debian Linux
+    DISTRO=$(lsb_release -c -s)
+    echo "Detected Debian Linux '$DISTRO'"
+    case "$DISTRO" in
+      jessie|vivid)
+        # Debian 8, Ubuntu 15
+        echo "Installing libopenslide via apt-get"
+        apt-get install -y libopenslide-dev
+        ;;
+      trusty|utopic|qiana|rebecca|rafaela)
+        # Ubuntu 14, Mint 17
+        echo "Installing libopenslide dependencies via apt-get"
+        apt-get install -y automake build-essential curl zlib1g-dev libopenjpeg-dev libpng12-dev libjpeg-dev libtiff5-dev libgdk-pixbuf2.0-dev libxml2-dev libsqlite3-dev libcairo2-dev libglib2.0-dev sqlite3 libsqlite3-dev
+        install_libopenslide_from_source
+        ;;
+      precise|wheezy|maya)
+        # Debian 7, Ubuntu 12.04, Mint 13
+        echo "Installing libopenslide dependencies via apt-get"
+        apt-get install -y automake build-essential curl zlib1g-dev libopenjpeg-dev libpng12-dev libjpeg-dev libtiff5-dev libgdk-pixbuf2.0-dev libxml2-dev libsqlite3-dev libcairo2-dev libglib2.0-dev sqlite3 libsqlite3-dev
+        install_libopenslide_from_source
+        ;;
+      *)
+        # Unsupported Debian-based OS
+        sorry "openslide" "Debian-based $DISTRO"
+        ;;
+    esac
+  elif [ -f /etc/redhat-release ]; then
+    # Red Hat Linux
+    RELEASE=$(cat /etc/redhat-release)
+    echo "Detected Red Hat Linux '$RELEASE'"
+    case $RELEASE in
+      "Red Hat Enterprise Linux release 7."*|"CentOS Linux release 7."*|"Scientific Linux release 7."*)
+        # RHEL/CentOS 7
+        echo "Installing libopenslide dependencies via yum"
+        yum groupinstall -y "Development Tools"
+        yum install -y tar curl libpng-devel libjpeg-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel gdk-pixbuf2-devel sqlite-devel cairo-devel glib2-devel
+        install_libopenslide_from_source "--prefix=/usr"
+        ;;
+      "Red Hat Enterprise Linux release 6."*|"CentOS release 6."*|"Scientific Linux release 6."*)
+        # RHEL/CentOS 6
+        echo "Installing libopenslide dependencies via yum"
+        yum groupinstall -y "Development Tools"
+        yum install -y tar curl libpng-devel libjpeg-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel gdk-pixbuf2-devel sqlite-devel cairo-devel glib2-devel
+        install_libopenslide_from_source "--prefix=/usr"
+        ;;
+      "Fedora release 21 "*|"Fedora release 22 "*)
+        # Fedora 21, 22
+        echo "Installing libopenslide via yum"
+        yum install -y openslide-devel
+        ;;
+      *)
+        # Unsupported RHEL-based OS
+        sorry "openslide" "$RELEASE"
+        ;;
+    esac
+  elif [ -f /etc/os-release ]; then
+    RELEASE=$(cat /etc/os-release | grep VERSION)
+    echo "Detected OpenSuse Linux '$RELEASE'"
+    case $RELEASE in
+      *"13.2"*)
+      echo "Installing libopenslide via zypper"
+      zypper --gpg-auto-import-keys install -y libopenslide-devel
      ;;
-    *)
-      if [ -f /etc/debian_version ]; then
-        # Debian Linux
-        DISTRO=$(lsb_release -c -s)
-        echo "Detected Debian Linux '$DISTRO'"
-        case "$DISTRO" in
-          jessie|vivid)
-            # Debian 8, Ubuntu 15
-            echo "Installing libopenslide via apt-get"
-            apt-get install -y libopenslide-dev
-            ;;
-          trusty|utopic|qiana|rebecca)
-            # Ubuntu 14, Mint 17
-            echo "Installing libopenslide dependencies via apt-get"
-            apt-get install -y automake build-essential curl zlib1g-dev libopenjpeg-dev libpng12-dev libjpeg-dev libtiff5-dev libgdk-pixbuf2.0-dev libxml2-dev libsqlite3-dev libcairo2-dev libglib2.0-dev sqlite3 libsqlite3-dev
-            install_libopenslide_from_source
-            ;;
-          precise|wheezy|maya)
-            # Debian 7, Ubuntu 12.04, Mint 13
-            echo "Installing libopenslide dependencies via apt-get"
-            apt-get install -y automake build-essential curl zlib1g-dev libopenjpeg-dev libpng12-dev libjpeg-dev libtiff5-dev libgdk-pixbuf2.0-dev libxml2-dev libsqlite3-dev libcairo2-dev libglib2.0-dev sqlite3 libsqlite3-dev
-            install_libopenslide_from_source
-            ;;
-          *)
-            # Unsupported Debian-based OS
-            sorry "openslide" "Debian-based $DISTRO"
-            ;;
-        esac
-      elif [ -f /etc/redhat-release ]; then
-        # Red Hat Linux
-        RELEASE=$(cat /etc/redhat-release)
-        echo "Detected Red Hat Linux '$RELEASE'"
-        case $RELEASE in
-          "Red Hat Enterprise Linux release 7."*|"CentOS Linux release 7."*|"Scientific Linux release 7."*)
-            # RHEL/CentOS 7
-            echo "Installing libopenslide dependencies via yum"
-            yum groupinstall -y "Development Tools"
-            yum install -y tar curl libpng-devel libjpeg-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel gdk-pixbuf2-devel sqlite-devel cairo-devel glib2-devel
-            install_libopenslide_from_source "--prefix=/usr"
-            ;;
-          "Red Hat Enterprise Linux release 6."*|"CentOS release 6."*|"Scientific Linux release 6."*)
-            # RHEL/CentOS 6
-            echo "Installing libopenslide dependencies via yum"
-            yum groupinstall -y "Development Tools"
-            yum install -y tar curl libpng-devel libjpeg-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel gdk-pixbuf2-devel sqlite-devel cairo-devel glib2-devel 
-            install_libopenslide_from_source "--prefix=/usr"
-            ;;
-          "Fedora release 21 "*|"Fedora release 22 "*)
-            # Fedora 21, 22
-            echo "Installing libopenslide via yum"
-            yum install -y openslide-devel
-            ;;
-          *)
-            # Unsupported RHEL-based OS
-            sorry "openslide" "$RELEASE"
-            ;;
-        esac
-      elif [ -f /etc/os-release ]; then
-        RELEASE=$(cat /etc/os-release | grep VERSION)
-        echo "Detected OpenSuse Linux '$RELEASE'"
-        case $RELEASE in
-          *"13.2"*)
-          echo "Installing libopenslide via zypper"
-          zypper --gpg-auto-import-keys install -y libopenslide-devel
-          ;;
-        esac
-      elif [ -f /etc/SuSE-brand ]; then
-        RELEASE=$(cat /etc/SuSE-brand | grep VERSION)
-        echo "Detected OpenSuse Linux '$RELEASE'"
-        case $RELEASE in
-          *"13.1")
-          echo "Installing libopenslide dependencies via zypper"
-          zypper --gpg-auto-import-keys install -y --type pattern devel_basis
-          zypper --gpg-auto-import-keys install -y tar curl libpng16-devel libjpeg-turbo libjpeg8-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel libgdk_pixbuf-2_0-0 sqlite3-devel cairo-devel glib2-devel
-          install_libopenslide_from_source
-          ;;
-        esac
-      else
-        # Unsupported OS
-        sorry "openslide" "$(uname -a)"
-      fi
+    esac
+  elif [ -f /etc/SuSE-brand ]; then
+    RELEASE=$(cat /etc/SuSE-brand | grep VERSION)
+    echo "Detected OpenSuse Linux '$RELEASE'"
+    case $RELEASE in
+      *"13.1")
+      echo "Installing libopenslide dependencies via zypper"
+      zypper --gpg-auto-import-keys install -y --type pattern devel_basis
+      zypper --gpg-auto-import-keys install -y tar curl libpng16-devel libjpeg-turbo libjpeg8-devel libxml2-devel zlib-devel openjpeg-devel libtiff-devel libgdk_pixbuf-2_0-0 sqlite3-devel cairo-devel glib2-devel
+      install_libopenslide_from_source
      ;;
-  esac
+    esac
+  else
+    # Unsupported OS
+    sorry "openslide" "$(uname -a)"
+  fi
 fi

 # OS-specific installations of libvips follows

-case $(uname -s) in
-  *[Dd]arwin*)
-    # Mac OS
-    echo "Detected Mac OS"
-    if type "brew" > /dev/null; then
-      echo "Installing libvips via homebrew"
+if [ -f /etc/debian_version ]; then
+  # Debian Linux
+  DISTRO=$(lsb_release -c -s)
+  echo "Detected Debian Linux '$DISTRO'"
+  case "$DISTRO" in
+    jessie|vivid)
+      # Debian 8, Ubuntu 15
      if [ $enable_openslide -eq 1 ]; then
-        brew install homebrew/science/vips --with-webp --with-graphicsmagick --with-openslide
+        echo "Recompiling vips with openslide support"
+        install_libvips_from_source
      else
-        brew install homebrew/science/vips --with-webp --with-graphicsmagick
+        echo "Installing libvips via apt-get"
+        apt-get install -y libvips-dev libgsf-1-dev
      fi
-    elif type "port" > /dev/null; then
-      echo "Installing libvips via MacPorts"
-      port install vips
-    else
-      sorry "vips" "Mac OS without homebrew or MacPorts"
-    fi
+      ;;
+    trusty|utopic|qiana|rebecca|rafaela)
+      # Ubuntu 14, Mint 17
+      echo "Installing libvips dependencies via apt-get"
+      apt-get install -y automake build-essential gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-dev libpng12-dev libwebp-dev libtiff5-dev libexif-dev libgsf-1-dev liblcms2-dev libxml2-dev swig libmagickcore-dev curl
+      install_libvips_from_source
+      ;;
+    precise|wheezy|maya)
+      # Debian 7, Ubuntu 12.04, Mint 13
+      echo "Installing libvips dependencies via apt-get"
+      add-apt-repository -y ppa:lyrasis/precise-backports
+      apt-get update
+      apt-get install -y automake build-essential gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-dev libpng12-dev libwebp-dev libtiff4-dev libexif-dev libgsf-1-dev liblcms2-dev libxml2-dev swig libmagickcore-dev curl
+      install_libvips_from_source
+      ;;
+    *)
+      # Unsupported Debian-based OS
+      sorry "vips" "Debian-based $DISTRO"
+      ;;
+  esac
+elif [ -f /etc/redhat-release ]; then
+  # Red Hat Linux
+  RELEASE=$(cat /etc/redhat-release)
+  echo "Detected Red Hat Linux '$RELEASE'"
+  case $RELEASE in
+    "Red Hat Enterprise Linux release 7."*|"CentOS Linux release 7."*|"Scientific Linux release 7."*)
+      # RHEL/CentOS 7
+      echo "Installing libvips dependencies via yum"
+      yum groupinstall -y "Development Tools"
+      yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
+      install_libvips_from_source "--prefix=/usr"
+      ;;
+    "Red Hat Enterprise Linux release 6."*|"CentOS release 6."*|"Scientific Linux release 6."*)
+      # RHEL/CentOS 6
+      echo "Installing libvips dependencies via yum"
+      yum groupinstall -y "Development Tools"
+      yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms-devel ImageMagick-devel curl
+      yum install -y http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
+      yum install -y --enablerepo=nux-dextop gobject-introspection-devel
+      yum install -y http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
+      yum install -y --enablerepo=remi libwebp-devel
+      install_libvips_from_source "--prefix=/usr"
+      ;;
+    "Fedora release 21 "*|"Fedora release 22 "*)
+      # Fedora 21, 22
+      if [ $enable_openslide -eq 1 ]; then
+        echo "Installing libvips dependencies via yum"
+        yum groupinstall -y "Development Tools"
+        yum install -y gcc-c++ gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
+        echo "Compiling vips with openslide support"
+        install_libvips_from_source "--prefix=/usr"
+      else
+        echo "Installing libvips via yum"
+        yum install -y vips-devel
+      fi
+      ;;
+    *)
+      # Unsupported RHEL-based OS
+      sorry "vips" "$RELEASE"
+      ;;
+  esac
+elif [ -f /etc/system-release ]; then
+  # Probably Amazon Linux
+  RELEASE=$(cat /etc/system-release)
+  case $RELEASE in
+    "Amazon Linux AMI release 2014.09"|"Amazon Linux AMI release 2015.03")
+      # Amazon Linux
+      echo "Detected '$RELEASE'"
+      echo "Installing libvips dependencies via yum"
+      yum groupinstall -y "Development Tools"
+      yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
+      install_libvips_from_source "--prefix=/usr"
+      ;;
+    *)
+      # Unsupported Amazon Linux version
+      sorry "vips" "$RELEASE"
+      ;;
+  esac
+elif [ -f /etc/os-release ]; then
+  RELEASE=$(cat /etc/os-release | grep VERSION)
+  echo "Detected OpenSuse Linux '$RELEASE'"
+  case $RELEASE in
+    *"13.2"*)
+    echo "Installing libvips dependencies via zypper"
+    zypper --gpg-auto-import-keys install -y --type pattern devel_basis
+    zypper --gpg-auto-import-keys install -y tar curl gtk-doc libxml2-devel libjpeg-turbo libjpeg8-devel libpng16-devel libtiff-devel libexif-devel liblcms2-devel ImageMagick-devel gobject-introspection-devel libwebp-devel
+    install_libvips_from_source
    ;;
-  *)
-    if [ -f /etc/debian_version ]; then
-      # Debian Linux
-      DISTRO=$(lsb_release -c -s)
-      echo "Detected Debian Linux '$DISTRO'"
-      case "$DISTRO" in
-        jessie|vivid)
-          # Debian 8, Ubuntu 15
-          if [ $enable_openslide -eq 1 ]; then
-            echo "Recompiling vips with openslide support"
-            install_libvips_from_source
-          else
-            echo "Installing libvips via apt-get"
-            apt-get install -y libvips-dev libgsf-1-dev
-          fi
-          ;;
-        trusty|utopic|qiana|rebecca)
-          # Ubuntu 14, Mint 17
-          echo "Installing libvips dependencies via apt-get"
-          apt-get install -y automake build-essential gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-dev libpng12-dev libwebp-dev libtiff5-dev libexif-dev libgsf-1-dev liblcms2-dev libxml2-dev swig libmagickcore-dev curl
-          install_libvips_from_source
-          ;;
-        precise|wheezy|maya)
-          # Debian 7, Ubuntu 12.04, Mint 13
-          echo "Installing libvips dependencies via apt-get"
-          add-apt-repository -y ppa:lyrasis/precise-backports
-          apt-get update
-          apt-get install -y automake build-essential gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-dev libpng12-dev libwebp-dev libtiff4-dev libexif-dev libgsf-1-dev liblcms2-dev libxml2-dev swig libmagickcore-dev curl
-          install_libvips_from_source
-          ;;
-        *)
-          # Unsupported Debian-based OS
-          sorry "vips" "Debian-based $DISTRO"
-          ;;
-      esac
-    elif [ -f /etc/redhat-release ]; then
-      # Red Hat Linux
-      RELEASE=$(cat /etc/redhat-release)
-      echo "Detected Red Hat Linux '$RELEASE'"
-      case $RELEASE in
-        "Red Hat Enterprise Linux release 7."*|"CentOS Linux release 7."*|"Scientific Linux release 7."*)
-          # RHEL/CentOS 7
-          echo "Installing libvips dependencies via yum"
-          yum groupinstall -y "Development Tools"
-          yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
-          install_libvips_from_source "--prefix=/usr"
-          ;;
-        "Red Hat Enterprise Linux release 6."*|"CentOS release 6."*|"Scientific Linux release 6."*)
-          # RHEL/CentOS 6
-          echo "Installing libvips dependencies via yum"
-          yum groupinstall -y "Development Tools"
-          yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms-devel ImageMagick-devel curl
-          yum install -y http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
-          yum install -y --enablerepo=nux-dextop gobject-introspection-devel
-          yum install -y http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
-          yum install -y --enablerepo=remi libwebp-devel
-          install_libvips_from_source "--prefix=/usr"
-          ;;
-        "Fedora release 21 "*|"Fedora release 22 "*)
-          # Fedora 21, 22
-          if [ $enable_openslide -eq 1 ]; then
-            echo "Installing libvips dependencies via yum"
-            yum groupinstall -y "Development Tools"
-            yum install -y gcc-c++ gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
-            echo "Compiling vips with openslide support"
-            install_libvips_from_source "--prefix=/usr"
-          else
-            echo "Installing libvips via yum"
-            yum install -y vips-devel
-          fi
-          ;;
-        *)
-          # Unsupported RHEL-based OS
-          sorry "vips" "$RELEASE"
-          ;;
-      esac
-    elif [ -f /etc/system-release ]; then
-      # Probably Amazon Linux
-      RELEASE=$(cat /etc/system-release)
-      case $RELEASE in
-        "Amazon Linux AMI release 2014.09"|"Amazon Linux AMI release 2015.03")
-          # Amazon Linux
-          echo "Detected '$RELEASE'"
-          echo "Installing libvips dependencies via yum"
-          yum groupinstall -y "Development Tools"
-          yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
-          install_libvips_from_source "--prefix=/usr"
-          ;;
-        *)
-          # Unsupported Amazon Linux version
-          sorry "vips" "$RELEASE"
-          ;;
-      esac
-    elif [ -f /etc/os-release ]; then
-      RELEASE=$(cat /etc/os-release | grep VERSION)
-      echo "Detected OpenSuse Linux '$RELEASE'"
-      case $RELEASE in
-        *"13.2"*)
-        echo "Installing libvips dependencies via zypper"
-        zypper --gpg-auto-import-keys install -y --type pattern devel_basis
-        zypper --gpg-auto-import-keys install -y tar curl gtk-doc libxml2-devel libjpeg-turbo libjpeg8-devel libpng16-devel libtiff-devel libexif-devel liblcms2-devel ImageMagick-devel gobject-introspection-devel libwebp-devel
-        install_libvips_from_source
-        ;;
-      esac
-    elif [ -f /etc/SuSE-brand ]; then
-      RELEASE=$(cat /etc/SuSE-brand | grep VERSION)
-      echo "Detected OpenSuse Linux '$RELEASE'"
-      case $RELEASE in
-        *"13.1")
-        echo "Installing libvips dependencies via zypper"
-        zypper --gpg-auto-import-keys install -y --type pattern devel_basis
-        zypper --gpg-auto-import-keys install -y tar curl gtk-doc libxml2-devel libjpeg-turbo libjpeg8-devel libpng16-devel libtiff-devel libexif-devel liblcms2-devel ImageMagick-devel gobject-introspection-devel libwebp-devel
-        install_libvips_from_source
-        ;;
-      esac
-    else
-      # Unsupported OS
-      sorry "vips" "$(uname -a)"
-    fi
+  esac
+elif [ -f /etc/SuSE-brand ]; then
+  RELEASE=$(cat /etc/SuSE-brand | grep VERSION)
+  echo "Detected OpenSuse Linux '$RELEASE'"
+  case $RELEASE in
+    *"13.1")
+    echo "Installing libvips dependencies via zypper"
+    zypper --gpg-auto-import-keys install -y --type pattern devel_basis
+    zypper --gpg-auto-import-keys install -y tar curl gtk-doc libxml2-devel libjpeg-turbo libjpeg8-devel libpng16-devel libtiff-devel libexif-devel liblcms2-devel ImageMagick-devel gobject-introspection-devel libwebp-devel
+    install_libvips_from_source
    ;;
-esac
+  esac
+else
+  # Unsupported OS
+  sorry "vips" "$(uname -a)"
+fi
--- a/src/common.cc
+++ b/src/common.cc
@@ -8,20 +8,20 @@
 // Verify platform and compiler compatibility

 #if (VIPS_MAJOR_VERSION < 7 || (VIPS_MAJOR_VERSION == 7 && VIPS_MINOR_VERSION < 40))
-#error libvips version 7.40.0+ required - see https://github.com/lovell/sharp#prerequisites
+#error libvips version 7.40.0+ required - see http://sharp.dimens.io/page/install
 #endif

 #ifdef _WIN64
-#error Windows 64-bit is currently unsupported - see https://github.com/lovell/sharp#windows
+#error Windows 64-bit is currently unsupported - see http://sharp.dimens.io/page/install#windows
 #endif

 #if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))
-#error GCC version 4.6+ is required for C++11 features - see https://github.com/lovell/sharp#prerequisites
+#error GCC version 4.6+ is required for C++11 features - see http://sharp.dimens.io/page/install#prerequisites
 #endif

 #if (defined(__clang__) && defined(__has_feature))
 #if (!__has_feature(cxx_range_for))
-#error clang version 3.0+ is required for C++11 features - see https://github.com/lovell/sharp#prerequisites
+#error clang version 3.0+ is required for C++11 features - see http://sharp.dimens.io/page/install#prerequisites
 #endif
 #endif

--- a/src/pipeline.cc
+++ b/src/pipeline.cc
@@ -445,7 +445,7 @@ class PipelineWorker : public NanAsyncWorker {
    }

    // Gamma encoding (darken)
-    if (baton->gamma >= 1 && baton->gamma <= 3) {
+    if (baton->gamma >= 1 && baton->gamma <= 3 && !HasAlpha(image)) {
      VipsImage *gammaEncoded;
      if (vips_gamma(image, &gammaEncoded, "exponent", 1.0 / baton->gamma, NULL)) {
        return Error();
@@ -495,9 +495,8 @@ class PipelineWorker : public NanAsyncWorker {
    bool shouldAffineTransform = xresidual != 0.0 || yresidual != 0.0;
    bool shouldBlur = baton->blurSigma != 0.0;
    bool shouldSharpen = baton->sharpenRadius != 0;
-    bool shouldTransform = shouldAffineTransform || shouldBlur || shouldSharpen;
    bool hasOverlay = !baton->overlayPath.empty();
-    bool shouldPremultiplyAlpha = HasAlpha(image) && image->Bands == 4 && (shouldTransform || hasOverlay);
+    bool shouldPremultiplyAlpha = HasAlpha(image) && (shouldAffineTransform || shouldBlur || shouldSharpen || hasOverlay);

    // Premultiply image alpha channel before all transformations to avoid
    // dark fringing around bright pixels
@@ -698,25 +697,6 @@ class PipelineWorker : public NanAsyncWorker {
      image = sharpened;
    }

-    // Gamma decoding (brighten)
-    if (baton->gamma >= 1 && baton->gamma <= 3) {
-      VipsImage *gammaDecoded;
-      if (vips_gamma(image, &gammaDecoded, "exponent", baton->gamma, NULL)) {
-        return Error();
-      }
-      vips_object_local(hook, gammaDecoded);
-      image = gammaDecoded;
-    }
-
-    // Apply normalization - stretch luminance to cover full dynamic range
-    if (baton->normalize) {
-      VipsImage *normalized;
-      if (Normalize(hook, image, &normalized)) {
-        return Error();
-      }
-      image = normalized;
-    }
-
    // Composite with overlay, if present
    if (hasOverlay) {
      VipsImage *overlayImage = NULL;
@@ -789,6 +769,25 @@ class PipelineWorker : public NanAsyncWorker {
      image = imageUnpremultiplied;
    }

+    // Gamma decoding (brighten)
+    if (baton->gamma >= 1 && baton->gamma <= 3 && !HasAlpha(image)) {
+      VipsImage *gammaDecoded;
+      if (vips_gamma(image, &gammaDecoded, "exponent", baton->gamma, NULL)) {
+        return Error();
+      }
+      vips_object_local(hook, gammaDecoded);
+      image = gammaDecoded;
+    }
+
+    // Apply normalization - stretch luminance to cover full dynamic range
+    if (baton->normalize) {
+      VipsImage *normalized;
+      if (Normalize(hook, image, &normalized)) {
+        return Error();
+      }
+      image = normalized;
+    }
+
    // Convert image to sRGB, if not already
    if (image->Type != VIPS_INTERPRETATION_sRGB) {
      // Switch interpretation to sRGB
--- a/test/bench/package.json
+++ b/test/bench/package.json
@@ -9,14 +9,14 @@
  },
  "devDependencies": {
    "imagemagick": "^0.1.3",
-    "imagemagick-native": "mash/node-imagemagick-native",
+    "imagemagick-native": "^1.8.0",
    "gm": "^1.18.1",
    "lwip": "^0.0.7",
-    "async": "^1.3.0",
-    "semver": "^4.3.6",
+    "async": "^1.4.2",
+    "semver": "^5.0.1",
    "benchmark": "^1.0.0"
  },
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
  "engines": {
    "node": ">=0.10"
  }
--- a/test/fixtures/expected/embed-enlarge.png
+++ b/test/fixtures/expected/embed-enlarge.png
--- a/test/fixtures/expected/gamma-0.0.jpg
+++ b/test/fixtures/expected/gamma-0.0.jpg
--- a/test/fixtures/expected/gamma-2.2.jpg
+++ b/test/fixtures/expected/gamma-2.2.jpg
--- a/test/fixtures/expected/gamma-3.0.jpg
+++ b/test/fixtures/expected/gamma-3.0.jpg
--- a/test/fixtures/expected/gamma-alpha.jpg
+++ b/test/fixtures/expected/gamma-alpha.jpg
--- a/test/unit/embed.js
+++ b/test/unit/embed.js
@@ -68,4 +68,18 @@ describe('Embed', function() {
      });
  });

+  it('Enlarge and embed', function(done) {
+    sharp(fixtures.inputPngWithOneColor)
+      .embed()
+      .resize(320, 240)
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('png', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        fixtures.assertSimilar(fixtures.expected('embed-enlarge.png'), data, done);
+      });
+  });
+
 });
--- a/test/unit/gamma.js
+++ b/test/unit/gamma.js
@@ -12,32 +12,53 @@ describe('Gamma correction', function() {
  it('value of 0.0 (disabled)', function(done) {
    sharp(fixtures.inputJpgWithGammaHoliness)
      .resize(129, 111)
-      .toFile(fixtures.path('output.gamma-0.0.jpg'), done);
+      .toBuffer(function(err, data, info) {
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(129, info.width);
+        assert.strictEqual(111, info.height);
+        fixtures.assertSimilar(fixtures.expected('gamma-0.0.jpg'), data, done);
+      });
  });

  it('value of 2.2 (default)', function(done) {
    sharp(fixtures.inputJpgWithGammaHoliness)
      .resize(129, 111)
      .gamma()
-      .toFile(fixtures.path('output.gamma-2.2.jpg'), done);
+      .toBuffer(function(err, data, info) {
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(129, info.width);
+        assert.strictEqual(111, info.height);
+        fixtures.assertSimilar(fixtures.expected('gamma-2.2.jpg'), data, done);
+      });
  });

  it('value of 3.0', function(done) {
    sharp(fixtures.inputJpgWithGammaHoliness)
      .resize(129, 111)
      .gamma(3)
-      .toFile(fixtures.path('output.gamma-3.0.jpg'), done);
+      .toBuffer(function(err, data, info) {
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(129, info.width);
+        assert.strictEqual(111, info.height);
+        fixtures.assertSimilar(fixtures.expected('gamma-3.0.jpg'), data, done);
+      });
  });

-  it('invalid value', function(done) {
-    var isValid = true;
-    try {
+  it('alpha transparency', function(done) {
+    sharp(fixtures.inputPngOverlayLayer1)
+      .resize(320)
+      .gamma()
+      .toBuffer(function(err, data, info) {
+        assert.strictEqual('png', info.format);
+        assert.strictEqual(320, info.width);
+        fixtures.assertSimilar(fixtures.expected('gamma-alpha.jpg'), data, done);
+      });
+  });
+
+  it('invalid value', function() {
+    assert.throws(function() {
      sharp(fixtures.inputJpgWithGammaHoliness).gamma(4);
-    } catch (err) {
-      isValid = false;
-    }
-    assert.strictEqual(false, isValid);
-    done();
+    });
  });

 });
Author	SHA1	Message	Date
Lovell Fuller	c4a278ec9c	Update changelog for v0.11.1 Version bumps for benchmark test	2015-08-12 09:49:50 +01:00
Lovell Fuller	658a541f49	Add test case for enlarge+embed combo #243	2015-08-12 09:26:38 +01:00
Lovell Fuller	01435977de	Blur and sharpen ops always convolve Partial revert of `36ac882`	2015-08-12 07:25:14 +01:00
Lovell Fuller	36ac8828f2	Gamma correction and premultiply do not mix Skip premultiply for fast blur/sharpen Automate gamma correction tests	2015-08-11 21:51:22 +01:00
Lovell Fuller	9c83d98bbb	Update Appveyor CI to MSVC 2015	2015-07-31 12:11:18 +01:00
Lovell Fuller	dee9ca3ec2	Merge pull request #244 from TheThing/patch-1 Silence MSVC warning: "C4530: C++ exception handler used, but unwind semantics are not enabled."	2015-07-26 15:58:54 +01:00
Jonatan Nilsson	d375327d20	binding.gyp: Fix warnings during compiling Fixes the following warnings while compiling: ``` D:\Forritun\Microsoft Visual Studio 14.0\VC\include\xlocale(341): warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc (compiling source file ..\src\common.cc) [D:\sharp\build\sharp.vcxproj] D:\Forritun\Microsoft Visual Studio 14.0\VC\include\xlocale(341): warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc (compiling source file ..\src\operations.cc) [D:\sharp\build\sharp.vcxproj] ...etc... ``` Solution taken from here: https://github.com/TooTallNate/node-gyp/issues/26#issuecomment-7296389	2015-07-25 07:44:06 +00:00
Lovell Fuller	09244192e9	Add permalinks back to mkdocs Erroneously removed in `de333eb`	2015-07-16 09:34:42 +01:00
Lovell Fuller	de333eb02d	Add PPA details for Ubuntu LTS Remove Mac OS from preinstall script - please use homebrew	2015-07-16 09:28:54 +01:00