Tighten 'extract' parameter validation #158

Merge pull request #156 from jonathanong/patch-1
⬇️ nan@^1.5.1
2026-02-04 05:36:18 +01:00 · 2015-01-29 22:46:04 +00:00 · 2015-01-28 22:04:52 +00:00 · 2015-01-27 15:11:40 -08:00 · 2015-01-25 11:34:16 +00:00 · 2015-01-23 11:00:39 +00:00
41 changed files with 1965 additions and 566 deletions
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,6 +1,8 @@
 {
  "strict": true,
  "node": true,
+  "maxparams": 4,
+  "maxcomplexity": 11,
  "globals": {
    "describe": true,
    "it": true
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,84 @@
+# Contributing to sharp
+
+Hello, thank you for your interest in helping!
+
+## Submit a new bug report
+
+Please create a [new issue](https://github.com/lovell/sharp/issues/new) containing the steps to reproduce the problem.
+
+New bugs are assigned a `triage` label whilst under investigation.
+
+If you're having problems with `npm install sharp`, please include the output of the following commands, perhaps as a [gist](https://gist.github.com/):
+
+```sh
+vips -v
+pkg-config --print-provides vips
+npm install --verbose sharp
+```
+
+## Submit a new feature request
+
+If a [similar request](https://github.com/lovell/sharp/labels/enhancement) exists, it's probably fastest to add a comment to it about your requirement.
+
+Implementation is usually straightforward if _libvips_ [already supports](http://www.vips.ecs.soton.ac.uk/supported/current/doc/html/libvips/ch03.html) the feature you need.
+
+## Submit a Pull Request to fix a bug
+
+Thank you! To prevent the problem occurring again, please add unit tests that would have failed.
+
+Please select the `master` branch as the destination for your Pull Request so your fix can be included in the next minor release.
+
+Please squash your changes into a single commit using a command like `git rebase -i upstream/master`.
+
+## Submit a Pull Request with a new feature
+
+Please add JavaScript [unit tests](https://github.com/lovell/sharp/tree/master/test/unit) to cover your new feature. A test coverage report for the JavaScript code is generated in the `coverage/lcov-report` directory.
+
+You deserve to add your details to the [list of contributors](https://github.com/lovell/sharp/blob/master/package.json#L5).
+
+Any change that modifies the existing public API should be added to the relevant work-in-progress branch for inclusion in the next major release.
+
+| Release | WIP branch |
+| ------: | :--------- |
+|  v0.9.0 | intake     |
+| v0.10.0 | judgement  |
+| v0.11.0 | knife      |
+
+Please squash your changes into a single commit using a command like `git rebase -i upstream/<wip-branch>`.
+
+### Add a new public method
+
+The API tries to be as fluent as possible. Image processing concepts follow the naming conventions from _libvips_ and, to a lesser extent, _ImageMagick_.
+
+Most methods have optional parameters and assume sensible defaults. Methods with mandatory parameters often have names like `doSomethingWith(X)`.
+
+Please ensure backwards compatibility where possible. Methods to modify previously default behaviour often have names like `withoutOptionY()` or `withExtraZ()`.
+
+Feel free to create a [new issue](https://github.com/lovell/sharp/issues/new) to gather feedback on a potential API change.
+
+### Remove an existing public method
+
+A method to be removed should be deprecated in the next major version then removed in the following major version.
+
+By way of example, the [bilinearInterpolation method](https://github.com/lovell/sharp/blob/v0.6.0/index.js#L155) present in v0.5.0 was deprecated in v0.6.0 and removed in v0.7.0.
+
+## Run the tests
+
+### Functional tests and static code analysis
+
+```sh
+npm test
+```
+
+### Memory leak tests
+
+Requires _valgrind_.
+
+```sh
+cd sharp/test/leak
+./leak.sh
+```
+
+## Finally
+
+Please feel free to ask any questions via a [new issue](https://github.com/lovell/sharp/issues/new) or contact me by [e-mail](https://github.com/lovell/sharp/blob/master/package.json#L4).
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 * [Installation](https://github.com/lovell/sharp#installation)
 * [Usage examples](https://github.com/lovell/sharp#usage-examples)
 * [API](https://github.com/lovell/sharp#api)
+* [Contributing](https://github.com/lovell/sharp#contributing)
 * [Testing](https://github.com/lovell/sharp#testing)
 * [Performance](https://github.com/lovell/sharp#performance)
 * [Thanks](https://github.com/lovell/sharp#thanks)
@@ -10,13 +11,15 @@

 The typical use case for this high speed Node.js module is to convert large images of many formats to smaller, web-friendly JPEG, PNG and WebP images of varying dimensions.

-The performance of JPEG resizing is typically 8x faster than ImageMagick and GraphicsMagick, based mainly on the number of CPU cores available.
+This module supports reading and writing JPEG, PNG and WebP images to and from Streams, Buffer objects and the filesystem.
+It also supports reading images of many other types from the filesystem via libmagick or libgraphicsmagick if present.
+Colour spaces, embedded ICC profiles and alpha transparency channels are all handled correctly.

-Memory usage is kept to a minimum, no child processes are spawned, everything remains non-blocking thanks to _libuv_ and Promises/A+ are supported.
+Only small regions of uncompressed image data are held in memory and processed at a time, taking full advantage of multiple CPU cores and L1/L2/L3 cache. Resizing an image is typically 4x faster than using the quickest ImageMagick and GraphicsMagick settings.

-This module supports reading and writing JPEG, PNG and WebP images to and from Streams, Buffer objects and the filesystem. It also supports reading images of many other types from the filesystem via libmagick++ or libgraphicsmagick++ if present.
+Huffman tables are optimised when generating JPEG output images without having to use separate command line tools like [jpegoptim](https://github.com/tjko/jpegoptim) and [jpegtran](http://jpegclub.org/jpegtran/). PNG filtering can be disabled, which for diagrams and line art often produces the same result as [pngcrush](http://pmt.sourceforge.net/pngcrush/).

-When generating JPEG output all metadata is removed and Huffman tables optimised without having to use separate command line tools like [jpegoptim](https://github.com/tjko/jpegoptim) and [jpegtran](http://jpegclub.org/jpegtran/).
+Everything remains non-blocking thanks to _libuv_, no child processes are spawned and Promises/A+ are supported.

 Anyone who has used the Node.js bindings for [GraphicsMagick](https://github.com/aheckmann/gm) will find the API similarly fluent.

@@ -29,20 +32,21 @@ This module is powered by the blazingly fast [libvips](https://github.com/jcupit
 ### Prerequisites

 * Node.js v0.10+
-* [libvips](https://github.com/jcupitt/libvips) v7.38.5+
+* [libvips](https://github.com/jcupitt/libvips) v7.40.0+ (7.42.0+ recommended)

-To install the latest version of libvips on the following Operating Systems:
+To install the most suitable version of libvips on the following Operating Systems:

 * Mac OS
  * Homebrew
  * MacPorts
 * Debian Linux
  * Debian 7, 8
-  * Ubuntu 12.04, 14.04, 14.10
+  * Ubuntu 12.04, 14.04, 14.10, 15.04
  * Mint 13, 17
 * Red Hat Linux
  * RHEL/Centos/Scientific 6, 7
  * Fedora 21, 22
+  * Amazon Linux 2014.09

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

@@ -68,13 +72,21 @@ The _gettext_ dependency of _libvips_ [can lead](https://github.com/lovell/sharp

 	brew link gettext --force

-### Install libvips on Heroku
+### Heroku

 [Alessandro Tagliapietra](https://github.com/alex88) maintains an [Heroku buildpack for libvips](https://github.com/alex88/heroku-buildpack-vips) and its dependencies.

-### Using with gulp.js
+### Docker

-[Mohammad Prabowo](https://github.com/rizalp) maintains a [gulp.js plugin](https://github.com/rizalp/gulp-sharp).
+[Marc Bachmann](https://github.com/marcbachmann) maintains a [Dockerfile for libvips](https://github.com/marcbachmann/dockerfile-libvips).
+
+	docker pull marcbachmann/libvips
+
+### Build tools
+
+* [gulp-responsive](https://www.npmjs.com/package/gulp-responsive)
+* [gulp-sharp](https://www.npmjs.com/package/gulp-sharp)
+* [grunt-sharp](https://www.npmjs.com/package/grunt-sharp)

 ## Usage examples

@@ -101,7 +113,7 @@ readableStream.pipe(transformer).pipe(writableStream);
 ```javascript
 var image = sharp(inputJpg);
 image.metadata(function(err, metadata) {
-  image.resize(metadata.width / 2).webp().toBuffer(function(err, outputBuffer, info) {
+  image.resize(Math.floor(metadata.width / 2)).webp().toBuffer(function(err, outputBuffer, info) {
    // outputBuffer contains a WebP image half the width and height of the original JPEG
  });
 });
@@ -214,12 +226,12 @@ sharp(inputBuffer)

 Constructor to which further methods are chained. `input`, if present, can be one of:

-* Buffer containing JPEG, PNG or WebP image data, or
+* Buffer containing JPEG, PNG, WebP or TIFF image data, or
 * String containing the filename of an image, with most major formats supported.

 The object returned implements the [stream.Duplex](http://nodejs.org/api/stream.html#stream_class_stream_duplex) class.

-JPEG, PNG or WebP format image data can be streamed into the object when `input` is not provided.
+JPEG, PNG, WebP or TIFF format image data can be streamed into the object when `input` is not provided.

 JPEG, PNG or WebP format image data can be streamed out from this object.

@@ -232,8 +244,9 @@ Fast access to image metadata without decoding any compressed image data.
 * `format`: Name of decoder to be used to decompress image data e.g. `jpeg`, `png`, `webp` (for file-based input additionally `tiff` and `magick`)
 * `width`: Number of pixels wide
 * `height`: Number of pixels high
-* `space`: Name of colour space interpretation e.g. `srgb`, `rgb`, `scrgb`, `cmyk`, `lab`, `xyz`, `b-w` [...](https://github.com/jcupitt/libvips/blob/master/libvips/iofuncs/enumtypes.c#L502)
+* `space`: Name of colour space interpretation e.g. `srgb`, `rgb`, `scrgb`, `cmyk`, `lab`, `xyz`, `b-w` [...](https://github.com/jcupitt/libvips/blob/master/libvips/iofuncs/enumtypes.c#L522)
 * `channels`: Number of bands e.g. `3` for sRGB, `4` for CMYK
+* `hasProfile`: Boolean indicating the presence of an embedded ICC profile
 * `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
 * `orientation`: Number value of the EXIF Orientation header, if present

@@ -243,15 +256,21 @@ A Promises/A+ promise is returned when `callback` is not provided.

 An advanced setting that switches the libvips access method to `VIPS_ACCESS_SEQUENTIAL`. This will reduce memory usage and can improve performance on some systems.

+#### limitInputPixels(pixels)
+
+Do not process input images where the number of pixels (width * height) exceeds this limit.
+
+`pixels` is the integral Number of pixels, with a value between 1 and the default 268402689 (0x3FFF * 0x3FFF).
+
 ### Image transformation options

 #### resize(width, [height])

 Scale output to `width` x `height`. By default, the resized image is cropped to the exact size specified.

-`width` is the Number of pixels wide the resultant image should be. Use `null` or `undefined` to auto-scale the width to match the height.
+`width` is the integral Number of pixels wide the resultant image should be, between 1 and 16383 (0x3FFF). Use `null` or `undefined` to auto-scale the width to match the height.

-`height` is the Number of pixels high the resultant image should be. Use `null` or `undefined` to auto-scale the height to match the width.
+`height` is the integral Number of pixels high the resultant image should be, between 1 and 16383. Use `null` or `undefined` to auto-scale the height to match the width.

 #### extract(top, left, width, height)

@@ -305,6 +324,8 @@ Rotate the output image by either an explicit angle or auto-orient based on the

 Use this method without `angle` to determine the angle from EXIF data. Mirroring is supported and may infer the use of a `flip` operation.

+Method order is important when both rotating and extracting regions, for example `rotate(x).extract(y)` will produce a different result to `extract(y).rotate(x)`.
+
 #### flip()

 Flip the image about the vertical Y axis. This always occurs after rotation, if any.
@@ -319,9 +340,23 @@ Do not enlarge the output image if the input image width *or* height are already

 This is equivalent to GraphicsMagick's `>` geometry option: "change the dimensions of the image only if its width or height exceeds the geometry specification".

-#### sharpen()
+#### blur([sigma])

-Perform a mild sharpen of the output image. This typically reduces performance by 10%.
+When used without parameters, performs a fast, mild blur of the output image. This typically reduces performance by 10%.
+
+When a `sigma` is provided, performs a slower, more accurate Gaussian blur. This typically reduces performance by 25%.
+
+* `sigma`, if present, is a Number between 0.3 and 1000 representing the approximate blur radius in pixels.
+
+#### sharpen([radius], [flat], [jagged])
+
+When used without parameters, performs a fast, mild sharpen of the output image. This typically reduces performance by 10%.
+
+When a `radius` is provided, performs a slower, more accurate sharpen of the L channel in the LAB colour space. Separate control over the level of sharpening in "flat" and "jagged" areas is available. This typically reduces performance by 50%.
+
+* `radius`, if present, is an integral Number representing the sharpen mask radius in pixels.
+* `flat`, if present, is a Number representing the level of sharpening to apply to "flat" areas, defaulting to a value of 1.0.
+* `jagged`, if present, is a Number representing the level of sharpening to apply to "jagged" areas, defaulting to a value of 2.0.

 #### interpolateWith(interpolator)

@@ -368,6 +403,18 @@ Use PNG format for the output image.

 Use WebP format for the output image.

+#### raw()
+
+_Requires libvips 7.42.0+_
+
+Provide raw, uncompressed uint8 (unsigned char) image data for Buffer and Stream based output.
+
+The number of channels depends on the input image and selected options.
+
+* 1 channel for images converted to `greyscale()`, with each byte representing one pixel.
+* 3 channels for colour images without alpha transparency, with bytes ordered \[red, green, blue, red, green, blue, etc.\]).
+* 4 channels for colour images with alpha transparency, with bytes ordered \[red, green, blue, alpha, red, green, blue, alpha, etc.\].
+
 #### quality(quality)

 The output quality to use for lossy JPEG, WebP and TIFF output formats. The default quality is `80`.
@@ -380,7 +427,9 @@ Use progressive (interlace) scan for JPEG and PNG output. This typically reduces

 #### withMetadata()

-Include all metadata (ICC, EXIF, XMP) from the input image in the output image. The default behaviour is to strip all metadata.
+Include all metadata (EXIF, XMP, IPTC) from the input image in the output image. This will also convert to and add the latest web-friendly v2 sRGB ICC profile.
+
+The default behaviour is to strip all metadata and convert to the device-independent sRGB colour space.

 #### compressionLevel(compressionLevel)

@@ -388,6 +437,12 @@ An advanced setting for the _zlib_ compression level of the lossless PNG output

 `compressionLevel` is a Number between 0 and 9.

+#### withoutAdaptiveFiltering()
+
+_Requires libvips 7.42.0+_
+
+An advanced setting to disable adaptive row filtering for the lossless PNG output format.
+
 ### Output methods

 #### toFile(filename, [callback])
@@ -397,7 +452,7 @@ An advanced setting for the _zlib_ compression level of the lossless PNG output
 `callback`, if present, is called with two arguments `(err, info)` where:

 * `err` contains an error message, if any.
-* `info` contains the output image `format`, `width` and `height`.
+* `info` contains the output image `format`, `size` (bytes), `width` and `height`.

 A Promises/A+ promise is returned when `callback` is not provided.

@@ -409,7 +464,7 @@ Write image data to a Buffer, the format of which will match the input image by

 * `err` is an error message, if any.
 * `buffer` is the output image data.
-* `info` contains the output image `format`, `width` and `height`.
+* `info` contains the output image `format`, `size` (bytes), `width` and `height`.

 A Promises/A+ promise is returned when `callback` is not provided.

@@ -432,7 +487,7 @@ sharp.cache(50, 200); // { current: 49, high: 99, memory: 50, items: 200}

 #### sharp.concurrency([threads])

-`threads`, if provided, is the Number of threads _libvips'_ should create for image processing. The default value is the number of CPU cores. A value of `0` will reset to this default.
+`threads`, if provided, is the Number of threads _libvips'_ should create for processing each image. The default value is the number of CPU cores. A value of `0` will reset to this default.

 This method always returns the current concurrency.

@@ -442,6 +497,8 @@ sharp.concurrency(2); // 2
 sharp.concurrency(0); // 4
 ```

+The maximum number of images that can be processed in parallel is limited by libuv's `UV_THREADPOOL_SIZE` environment variable.
+
 #### sharp.counters()

 Provides access to internal task counters.
@@ -453,6 +510,10 @@ Provides access to internal task counters.
 var counters = sharp.counters(); // { queue: 2, process: 4 }
 ```

+## Contributing
+
+A [guide for contributors](https://github.com/lovell/sharp/blob/master/CONTRIBUTING.md) covers reporting bugs, requesting features and submitting code changes.
+
 ## Testing

 ### Functional tests
@@ -469,29 +530,6 @@ var counters = sharp.counters(); // { queue: 2, process: 4 }

 [![Centos 6.5 Build Status](https://snap-ci.com/lovell/sharp/branch/master/build_image)](https://snap-ci.com/lovell/sharp/branch/master)

-#### It worked on my machine
-
-```
-npm test
-```
-
-### Memory leak tests
-
-```
-cd sharp/test/leak
-./leak.sh
-```
-
-Requires _valgrind_:
-
-```
-brew install valgrind
-```
-
-```
-sudo apt-get install -qq valgrind
-```
-
 ### Benchmark tests

 ```
@@ -508,7 +546,7 @@ brew install graphicsmagick
 ```

 ```
-sudo apt-get install -qq imagemagick graphicsmagick libmagick++-dev
+sudo apt-get install -qq imagemagick graphicsmagick libmagickcore-dev
 ```

 ```
@@ -528,7 +566,7 @@ sudo yum install -y --enablerepo=epel GraphicsMagick

 ### The contenders

-* [imagemagick-native](https://github.com/mash/node-imagemagick-native) v1.2.2 - Supports Buffers only and blocks main V8 thread whilst processing.
+* [imagemagick-native](https://github.com/mash/node-imagemagick-native) v1.2.2 - Supports Buffers only
 * [imagemagick](https://github.com/yourdeveloper/node-imagemagick) v0.1.3 - Supports filesystem only and "has been unmaintained for a long time".
 * [gm](https://github.com/aheckmann/gm) v1.16.0 - Fully featured wrapper around GraphicsMagick.
 * sharp v0.6.2 - Caching within libvips disabled to ensure a fair comparison.
@@ -578,7 +616,7 @@ Thank you!

 ## Licence

-Copyright 2013, 2014 Lovell Fuller and contributors.
+Copyright 2013, 2014, 2015 Lovell Fuller and contributors.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
--- a/icc/USWebCoatedSWOP.icc
+++ b/icc/USWebCoatedSWOP.icc
--- a/icc/sRGB_IEC61966-2-1_black_scaled.icc
+++ b/icc/sRGB_IEC61966-2-1_black_scaled.icc
--- a/index.js
+++ b/index.js
@@ -1,12 +1,21 @@
 'use strict';

+var path = require('path');
 var util = require('util');
 var stream = require('stream');

+var semver = require('semver');
 var color = require('color');
 var BluebirdPromise = require('bluebird');

 var sharp = require('./build/Release/sharp');
+var libvipsVersion = sharp.libvipsVersion();
+
+var maximum = {
+  width: 0x3FFF,
+  height: 0x3FFF,
+  pixels: Math.pow(0x3FFF, 2)
+};

 var Sharp = function(input) {
  if (!(this instanceof Sharp)) {
@@ -15,8 +24,12 @@ var Sharp = function(input) {
  stream.Duplex.call(this);
  this.options = {
    // input options
+    bufferIn: null,
    streamIn: false,
    sequentialRead: false,
+    limitInputPixels: maximum.pixels,
+    // ICC profiles
+    iccProfilePath: path.join(__dirname, 'icc') + path.sep,
    // resize options
    topOffsetPre: -1,
    leftOffsetPre: -1,
@@ -31,6 +44,7 @@ var Sharp = function(input) {
    canvas: 'c',
    gravity: 0,
    angle: 0,
+    rotateBeforePreExtract: false,
    flip: false,
    flop: false,
    withoutEnlargement: false,
@@ -38,7 +52,10 @@ var Sharp = function(input) {
    // operations
    background: [0, 0, 0, 255],
    flatten: false,
-    sharpen: false,
+    blurSigma: 0,
+    sharpenRadius: 0,
+    sharpenFlat: 1,
+    sharpenJagged: 2,
    gamma: 0,
    greyscale: false,
    // output options
@@ -46,6 +63,7 @@ var Sharp = function(input) {
    progressive: false,
    quality: 80,
    compressionLevel: 6,
+    withoutAdaptiveFiltering: false,
    streamOut: false,
    withMetadata: false
  };
@@ -55,14 +73,20 @@ var Sharp = function(input) {
  } else if (typeof input === 'object' && input instanceof Buffer) {
    // input=buffer
    if (
-      (input.length > 1) &&
-      (input[0] === 0xff && input[1] === 0xd8) || // JPEG
-      (input[0] === 0x89 && input[1] === 0x50) || // PNG
-      (input[0] === 0x52 && input[1] === 0x49) // WebP
+      (input.length > 3) &&
+      // JPEG
+      (input[0] === 0xFF && input[1] === 0xD8) ||
+      // PNG
+      (input[0] === 0x89 && input[1] === 0x50) ||
+      // WebP
+      (input[0] === 0x52 && input[1] === 0x49) ||
+      // TIFF
+      (input[0] === 0x4D && input[1] === 0x4D && input[2] === 0x00 && (input[3] === 0x2A || input[3] === 0x2B)) ||
+      (input[0] === 0x49 && input[1] === 0x49 && (input[2] === 0x2A || input[2] === 0x2B) && input[3] === 0x00)
    ) {
      this.options.bufferIn = input;
    } else {
-      throw new Error('Buffer contains an unsupported image format. JPEG, PNG and WebP are currently supported.');
+      throw new Error('Buffer contains an unsupported image format. JPEG, PNG, WebP and TIFF are currently supported.');
    }
  } else {
    // input=stream
@@ -80,16 +104,16 @@ Sharp.prototype._write = function(chunk, encoding, callback) {
  /*jslint unused: false */
  if (this.options.streamIn) {
    if (typeof chunk === 'object' && chunk instanceof Buffer) {
-      if (typeof this.options.bufferIn === 'undefined') {
-        // Create new Buffer
-        this.options.bufferIn = new Buffer(chunk.length);
-        chunk.copy(this.options.bufferIn);
-      } else {
+      if (this.options.bufferIn instanceof Buffer) {
        // Append to existing Buffer
        this.options.bufferIn = Buffer.concat(
          [this.options.bufferIn, chunk],
          this.options.bufferIn.length + chunk.length
        );
+      } else {
+        // Create new Buffer
+        this.options.bufferIn = new Buffer(chunk.length);
+        chunk.copy(this.options.bufferIn);
      }
      callback();
    } else {
@@ -118,21 +142,19 @@ Sharp.prototype.extract = function(topOffset, leftOffset, width, height) {
  var suffix = this.options.width === -1 && this.options.height === -1 ? 'Pre' : 'Post';
  var values = arguments;
  ['topOffset', 'leftOffset', 'width', 'height'].forEach(function(name, index) {
-    this.options[name + suffix] = values[index];
+    if (typeof values[index] === 'number' && !Number.isNaN(values[index]) && (values[index] % 1 === 0) && values[index] >= 0) {
+      this.options[name + suffix] = values[index];
+    } else {
+      throw new Error('Non-integer value for ' + name + ' of ' + values[index]);
+    }
  }.bind(this));
+  // Ensure existing rotation occurs before pre-resize extraction
+  if (suffix === 'Pre' && this.options.angle !== 0) {
+    this.options.rotateBeforePreExtract = true;
+  }
  return this;
 };

-/*
-  Deprecated embed* methods, to be removed in v0.8.0
-*/
-Sharp.prototype.embedWhite = util.deprecate(function() {
-  return this.background('white').embed();
-}, "embedWhite() is deprecated, use background('white').embed() instead");
-Sharp.prototype.embedBlack = util.deprecate(function() {
-  return this.background('black').embed();
-}, "embedBlack() is deprecated, use background('black').embed() instead");
-
 /*
  Set the background colour for embed and flatten operations.
  Delegates to the 'Color' module, which can throw an Error
@@ -201,8 +223,64 @@ Sharp.prototype.withoutEnlargement = function(withoutEnlargement) {
  return this;
 };

-Sharp.prototype.sharpen = function(sharpen) {
-  this.options.sharpen = (typeof sharpen === 'boolean') ? sharpen : true;
+/*
+  Blur the output image.
+  Call without a sigma to use a fast, mild blur.
+  Call with a sigma to use a slower, more accurate Gaussian blur.
+*/
+Sharp.prototype.blur = function(sigma) {
+  if (typeof sigma === 'undefined') {
+    // No arguments: default to mild blur
+    this.options.blurSigma = -1;
+  } else if (typeof sigma === 'boolean') {
+    // Boolean argument: apply mild blur?
+    this.options.blurSigma = sigma ? -1 : 0;
+  } else if (typeof sigma === 'number' && !Number.isNaN(sigma) && sigma >= 0.3 && sigma <= 1000) {
+    // Numeric argument: specific sigma
+    this.options.blurSigma = sigma;
+  } else {
+    throw new Error('Invalid blur sigma (0.3 to 1000.0) ' + sigma);
+  }
+  return this;
+};
+
+/*
+  Sharpen the output image.
+  Call without a radius to use a fast, mild sharpen.
+  Call with a radius to use a slow, accurate sharpen using the L of LAB colour space.
+    radius - size of mask in pixels, must be integer
+    flat - level of "flat" area sharpen, default 1
+    jagged - level of "jagged" area sharpen, default 2
+*/
+Sharp.prototype.sharpen = function(radius, flat, jagged) {
+  if (typeof radius === 'undefined') {
+    // No arguments: default to mild sharpen
+    this.options.sharpenRadius = -1;
+  } else if (typeof radius === 'boolean') {
+    // Boolean argument: apply mild sharpen?
+    this.options.sharpenRadius = radius ? -1 : 0;
+  } else if (typeof radius === 'number' && !Number.isNaN(radius) && (radius % 1 === 0) && radius >= 1) {
+    // Numeric argument: specific radius
+    this.options.sharpenRadius = radius;
+    // Control over flat areas
+    if (typeof flat !== 'undefined' && flat !== null) {
+      if (typeof flat === 'number' && !Number.isNaN(flat) && flat >= 0) {
+        this.options.sharpenFlat = flat;
+      } else {
+        throw new Error('Invalid sharpen level for flat areas ' + flat + ' (expected >= 0)');
+      }
+    }
+    // Control over jagged areas
+    if (typeof jagged !== 'undefined' && jagged !== null) {
+      if (typeof jagged === 'number' && !Number.isNaN(jagged) && jagged >= 0) {
+        this.options.sharpenJagged = jagged;
+      } else {
+        throw new Error('Invalid sharpen level for jagged areas ' + jagged + ' (expected >= 0)');
+      }
+    }
+  } else {
+    throw new Error('Invalid sharpen radius ' + radius + ' (expected integer >= 1)');
+  }
  return this;
 };

@@ -266,6 +344,9 @@ Sharp.prototype.quality = function(quality) {
  return this;
 };

+/*
+  zlib compression level for PNG output
+*/
 Sharp.prototype.compressionLevel = function(compressionLevel) {
  if (!Number.isNaN(compressionLevel) && compressionLevel >= 0 && compressionLevel <= 9) {
    this.options.compressionLevel = compressionLevel;
@@ -275,6 +356,18 @@ Sharp.prototype.compressionLevel = function(compressionLevel) {
  return this;
 };

+/*
+  Disable the use of adaptive row filtering for PNG output - requires libvips 7.42.0+
+*/
+Sharp.prototype.withoutAdaptiveFiltering = function(withoutAdaptiveFiltering) {
+  if (semver.gte(libvipsVersion, '7.42.0')) {
+    this.options.withoutAdaptiveFiltering = (typeof withoutAdaptiveFiltering === 'boolean') ? withoutAdaptiveFiltering : true;
+  } else {
+    console.error('withoutAdaptiveFiltering requires libvips 7.41.0+');
+  }
+  return this;
+};
+
 Sharp.prototype.withMetadata = function(withMetadata) {
  this.options.withMetadata = (typeof withMetadata === 'boolean') ? withMetadata : true;
  return this;
@@ -284,24 +377,37 @@ Sharp.prototype.resize = function(width, height) {
  if (!width) {
    this.options.width = -1;
  } else {
-    if (typeof width === 'number' && !Number.isNaN(width)) {
+    if (typeof width === 'number' && !Number.isNaN(width) && width % 1 === 0 && width > 0 && width <= maximum.width) {
      this.options.width = width;
    } else {
-      throw new Error('Invalid width ' + width);
+      throw new Error('Invalid width (1 to ' + maximum.width + ') ' + width);
    }
  }
  if (!height) {
    this.options.height = -1;
  } else {
-    if (typeof height === 'number' && !Number.isNaN(height)) {
+    if (typeof height === 'number' && !Number.isNaN(height) && height % 1 === 0 && height > 0 && height <= maximum.height) {
      this.options.height = height;
    } else {
-      throw new Error('Invalid height ' + height);
+      throw new Error('Invalid height (1 to ' + maximum.height + ') ' + height);
    }
  }
  return this;
 };

+/*
+  Limit the total number of pixels for input images
+  Assumes the image dimensions contained in the file header can be trusted
+*/
+Sharp.prototype.limitInputPixels = function(limit) {
+  if (typeof limit === 'number' && !Number.isNaN(limit) && limit % 1 === 0 && limit > 0 && limit <= maximum.pixels) {
+    this.options.limitInputPixels = limit;
+  } else {
+    throw new Error('Invalid pixel limit (1 to ' + maximum.pixels + ') ' + limit);
+  }
+  return this;
+};
+
 /*
  Write output image data to a file
 */
@@ -348,6 +454,15 @@ Sharp.prototype.webp = function() {
  return this;
 };

+Sharp.prototype.raw = function() {
+  if (semver.gte(libvipsVersion, '7.42.0')) {
+    this.options.output = '__raw';
+  } else {
+    console.error('Raw output requires libvips 7.42.0+');
+  }
+  return this;
+};
+
 /*
  Used by a Writable Stream to notify that it is ready for data
 */
@@ -503,3 +618,10 @@ module.exports.concurrency = function(concurrency) {
 module.exports.counters = function() {
  return sharp.counters();
 };
+
+/*
+  Get the version of the libvips library
+*/
+module.exports.libvipsVersion = function() {
+  return libvipsVersion;
+};
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sharp",
-  "version": "0.7.1",
+  "version": "0.9.1",
  "author": "Lovell Fuller <npm@lovell.info>",
  "contributors": [
    "Pierre Inglebert <pierre.inglebert@gmail.com>",
@@ -13,9 +13,9 @@
    "Brandon Aaron <hello.brandon@aaron.sh>",
    "Andreas Lind <andreas@one.com>"
  ],
-  "description": "High performance Node.js module to resize JPEG, PNG and WebP images using the libvips library",
+  "description": "High performance Node.js module to resize JPEG, PNG, WebP and TIFF images using the libvips library",
  "scripts": {
-    "test": "node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=10000 ./test/unit/*.js"
+    "test": "VIPS_WARNING=0 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=10000 ./test/unit/*.js"
  },
  "main": "index.js",
  "repository": {
@@ -27,29 +27,24 @@
    "png",
    "webp",
    "tiff",
-    "gif",
    "resize",
    "thumbnail",
-    "sharpen",
    "crop",
-    "extract",
-    "embed",
    "libvips",
-    "vips",
-    "fast",
-    "buffer",
-    "stream"
+    "vips"
  ],
  "dependencies": {
-    "bluebird": "^2.3.9",
-    "color": "^0.7.1",
-    "nan": "^1.3.0"
+    "bluebird": "^2.9.3",
+    "color": "^0.7.3",
+    "nan": "^1.5.1",
+    "semver": "^4.2.0"
  },
  "devDependencies": {
-    "mocha": "^2.0.1",
+    "mocha": "^2.1.0",
    "mocha-jshint": "^0.0.9",
-    "istanbul": "^0.3.2",
-    "coveralls": "^2.11.2"
+    "istanbul": "^0.3.5",
+    "coveralls": "^2.11.2",
+    "node-cpplint": "^0.4.0"
  },
  "license": "Apache 2.0",
  "engines": {
--- a/preinstall.sh
+++ b/preinstall.sh
@@ -5,22 +5,23 @@
 # * Mac OS
 # * Debian Linux
 #   * Debian 7, 8
-#   * Ubuntu 12.04, 14.04, 14.10
+#   * Ubuntu 12.04, 14.04, 14.10, 15.04
 #   * Mint 13, 17
 # * Red Hat Linux
 #   * RHEL/Centos/Scientific 6, 7
 #   * Fedora 21, 22
+#   * Amazon Linux 2014.09

-vips_version_minimum=7.38.5
-vips_version_latest_major=7.40
-vips_version_latest_minor=11
+vips_version_minimum=7.40.0
+vips_version_latest_major=7.42
+vips_version_latest_minor=1

 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 ..
@@ -86,17 +87,23 @@ case $(uname -s) in
      DISTRO=$(lsb_release -c -s)
      echo "Detected Debian Linux '$DISTRO'"
      case "$DISTRO" in
-        jessie|trusty|utopic|qiana)
-          # Debian 8, Ubuntu 14, Mint 17
+        jessie|vivid)
+          # Debian 8, Ubuntu 15
          echo "Installing libvips via apt-get"
          apt-get install -y libvips-dev
          ;;
+        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-turbo8-dev libpng12-dev libwebp-dev libtiff5-dev libexif-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-turbo8-dev libpng12-dev libwebp-dev libtiff4-dev libexif-dev libxml2-dev swig libmagickwand-dev curl
+          apt-get install -y automake build-essential gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-turbo8-dev libpng12-dev libwebp-dev libtiff4-dev libexif-dev liblcms2-dev libxml2-dev swig libmagickcore-dev curl
          install_libvips_from_source
          ;;
        *)
@@ -113,14 +120,14 @@ case $(uname -s) in
          # 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 ImageMagick-devel gobject-introspection-devel libwebp-devel curl
+          yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-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 ImageMagick-devel curl
+          yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-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
@@ -137,6 +144,19 @@ case $(uname -s) in
          sorry "$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
+          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 lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
+          install_libvips_from_source "--prefix=/usr"
+          ;;
+      esac
    else
      # Unsupported OS
      sorry "$(uname -a)"
--- a/src/common.cc
+++ b/src/common.cc
@@ -4,96 +4,162 @@

 #include "common.h"

-// How many tasks are in the queue?
-volatile int counter_queue = 0;
+namespace sharp {

-// How many tasks are being processed?
-volatile int counter_process = 0;
+  // How many tasks are in the queue?
+  volatile int counterQueue = 0;

-// Filename extension checkers
-static bool ends_with(std::string const &str, std::string const &end) {
-  return str.length() >= end.length() && 0 == str.compare(str.length() - end.length(), end.length(), end);
-}
-bool is_jpeg(std::string const &str) {
-  return ends_with(str, ".jpg") || ends_with(str, ".jpeg") || ends_with(str, ".JPG") || ends_with(str, ".JPEG");
-}
-bool is_png(std::string const &str) {
-  return ends_with(str, ".png") || ends_with(str, ".PNG");
-}
-bool is_webp(std::string const &str) {
-  return ends_with(str, ".webp") || ends_with(str, ".WEBP");
-}
-bool is_tiff(std::string const &str) {
-  return ends_with(str, ".tif") || ends_with(str, ".tiff") || ends_with(str, ".TIF") || ends_with(str, ".TIFF");
-}
+  // How many tasks are being processed?
+  volatile int counterProcess = 0;

-unsigned char const MARKER_JPEG[] = {0xff, 0xd8};
-unsigned char const MARKER_PNG[] = {0x89, 0x50};
-unsigned char const MARKER_WEBP[] = {0x52, 0x49};
-
-/*
-  Initialise a VipsImage from a buffer. Supports JPEG, PNG and WebP.
-  Returns the ImageType detected, if any.
-*/
-ImageType
-sharp_init_image_from_buffer(VipsImage **image, void *buffer, size_t const length, VipsAccess const access) {
-  ImageType imageType = UNKNOWN;
-  if (memcmp(MARKER_JPEG, buffer, 2) == 0) {
-    if (!vips_jpegload_buffer(buffer, length, image, "access", access, NULL)) {
-      imageType = JPEG;
-    }
-  } else if(memcmp(MARKER_PNG, buffer, 2) == 0) {
-    if (!vips_pngload_buffer(buffer, length, image, "access", access, NULL)) {
-      imageType = PNG;
-    }
-  } else if(memcmp(MARKER_WEBP, buffer, 2) == 0) {
-    if (!vips_webpload_buffer(buffer, length, image, "access", access, NULL)) {
-      imageType = WEBP;
-    }
+  // Filename extension checkers
+  static bool EndsWith(std::string const &str, std::string const &end) {
+    return str.length() >= end.length() && 0 == str.compare(str.length() - end.length(), end.length(), end);
  }
-  return imageType;
-}
-
-/*
-  Initialise a VipsImage from a file.
-  Returns the ImageType detected, if any.
-*/
-ImageType
-sharp_init_image_from_file(VipsImage **image, char const *file, VipsAccess const access) {
-  ImageType imageType = UNKNOWN;
-  if (vips_foreign_is_a("jpegload", file)) {
-    if (!vips_jpegload(file, image, "access", access, NULL)) {
-      imageType = JPEG;
-    }
-  } else if (vips_foreign_is_a("pngload", file)) {
-    if (!vips_pngload(file, image, "access", access, NULL)) {
-      imageType = PNG;
-    }
-  } else if (vips_foreign_is_a("webpload", file)) {
-    if (!vips_webpload(file, image, "access", access, NULL)) {
-      imageType = WEBP;
-    }
-  } else if (vips_foreign_is_a("tiffload", file)) {
-    if (!vips_tiffload(file, image, "access", access, NULL)) {
-      imageType = TIFF;
-    }
-  } else if(vips_foreign_is_a("magickload", file)) {
-    if (!vips_magickload(file, image, "access", access, NULL)) {
-      imageType = MAGICK;
-    }
+  bool IsJpeg(std::string const &str) {
+    return EndsWith(str, ".jpg") || EndsWith(str, ".jpeg") || EndsWith(str, ".JPG") || EndsWith(str, ".JPEG");
+  }
+  bool IsPng(std::string const &str) {
+    return EndsWith(str, ".png") || EndsWith(str, ".PNG");
+  }
+  bool IsWebp(std::string const &str) {
+    return EndsWith(str, ".webp") || EndsWith(str, ".WEBP");
+  }
+  bool IsTiff(std::string const &str) {
+    return EndsWith(str, ".tif") || EndsWith(str, ".tiff") || EndsWith(str, ".TIF") || EndsWith(str, ".TIFF");
  }
-  return imageType;
-}

-/*
-  Does this image have an alpha channel?
-  Uses colour space interpretation with number of channels to guess this.
-*/
-bool
-sharp_image_has_alpha(VipsImage *image) {
-  return (
-    (image->Bands == 2 && image->Type == VIPS_INTERPRETATION_B_W) ||
-    (image->Bands == 4 && image->Type != VIPS_INTERPRETATION_CMYK) ||
-    (image->Bands == 5 && image->Type == VIPS_INTERPRETATION_CMYK)
-  );
-}
+  // Buffer content checkers
+  unsigned char const MARKER_JPEG[] = {0xff, 0xd8};
+  unsigned char const MARKER_PNG[] = {0x89, 0x50};
+  unsigned char const MARKER_WEBP[] = {0x52, 0x49};
+
+  static bool buffer_is_tiff(char *buffer, size_t len) {
+    return (
+      len >= 4 && (
+        (buffer[0] == 'M' && buffer[1] == 'M' && buffer[2] == '\0' && (buffer[3] == '*' || buffer[3] == '+')) ||
+        (buffer[0] == 'I' && buffer[1] == 'I' && (buffer[2] == '*' || buffer[2] == '+') && buffer[3] == '\0')
+      )
+    );
+  }
+
+  /*
+    Determine image format of a buffer.
+  */
+  ImageType DetermineImageType(void *buffer, size_t const length) {
+    ImageType imageType = ImageType::UNKNOWN;
+    if (length >= 4) {
+      if (memcmp(MARKER_JPEG, buffer, 2) == 0) {
+        imageType = ImageType::JPEG;
+      } else if (memcmp(MARKER_PNG, buffer, 2) == 0) {
+        imageType = ImageType::PNG;
+      } else if (memcmp(MARKER_WEBP, buffer, 2) == 0) {
+        imageType = ImageType::WEBP;
+      } else if (buffer_is_tiff(static_cast<char*>(buffer), length)) {
+        imageType = ImageType::TIFF;
+      }
+    }
+    return imageType;
+  }
+
+  /*
+    Initialise and return a VipsImage from a buffer. Supports JPEG, PNG, WebP and TIFF.
+  */
+  VipsImage* InitImage(ImageType imageType, void *buffer, size_t const length, VipsAccess const access) {
+    VipsImage *image = NULL;
+    if (imageType == ImageType::JPEG) {
+      vips_jpegload_buffer(buffer, length, &image, "access", access, NULL);
+    } else if (imageType == ImageType::PNG) {
+      vips_pngload_buffer(buffer, length, &image, "access", access, NULL);
+    } else if (imageType == ImageType::WEBP) {
+      vips_webpload_buffer(buffer, length, &image, "access", access, NULL);
+    } else if (imageType == ImageType::TIFF) {
+      vips_tiffload_buffer(buffer, length, &image, "access", access, NULL);
+    }
+    return image;
+  }
+
+  /*
+    Inpect the first 2-4 bytes of a file to determine image format
+  */
+  ImageType DetermineImageType(char const *file) {
+    ImageType imageType = ImageType::UNKNOWN;
+    if (vips_foreign_is_a("jpegload", file)) {
+      imageType = ImageType::JPEG;
+    } else if (vips_foreign_is_a("pngload", file)) {
+      imageType = ImageType::PNG;
+    } else if (vips_foreign_is_a("webpload", file)) {
+      imageType = ImageType::WEBP;
+    } else if (vips_foreign_is_a("tiffload", file)) {
+      imageType = ImageType::TIFF;
+    } else if(vips_foreign_is_a("magickload", file)) {
+      imageType = ImageType::MAGICK;
+    }
+    return imageType;
+  }
+
+  /*
+    Initialise and return a VipsImage from a file.
+  */
+  VipsImage* InitImage(ImageType imageType, char const *file, VipsAccess const access) {
+    VipsImage *image = NULL;
+    if (imageType == ImageType::JPEG) {
+      vips_jpegload(file, &image, "access", access, NULL);
+    } else if (imageType == ImageType::PNG) {
+      vips_pngload(file, &image, "access", access, NULL);
+    } else if (imageType == ImageType::WEBP) {
+      vips_webpload(file, &image, "access", access, NULL);
+    } else if (imageType == ImageType::TIFF) {
+      vips_tiffload(file, &image, "access", access, NULL);
+    } else if (imageType == ImageType::MAGICK) {
+      vips_magickload(file, &image, "access", access, NULL);
+    }
+    return image;
+  }
+
+  /*
+    Does this image have an embedded profile?
+  */
+  bool HasProfile(VipsImage *image) {
+    return (vips_image_get_typeof(image, VIPS_META_ICC_NAME) > 0) ? TRUE : FALSE;
+  }
+
+  /*
+    Does this image have an alpha channel?
+    Uses colour space interpretation with number of channels to guess this.
+  */
+  bool HasAlpha(VipsImage *image) {
+    return (
+      (image->Bands == 2 && image->Type == VIPS_INTERPRETATION_B_W) ||
+      (image->Bands == 4 && image->Type != VIPS_INTERPRETATION_CMYK) ||
+      (image->Bands == 5 && image->Type == VIPS_INTERPRETATION_CMYK)
+    );
+  }
+
+  /*
+    Get EXIF Orientation of image, if any.
+  */
+  int ExifOrientation(VipsImage const *image) {
+    int orientation = 0;
+    const char *exif;
+    if (
+      vips_image_get_typeof(image, "exif-ifd0-Orientation") != 0 &&
+      !vips_image_get_string(image, "exif-ifd0-Orientation", &exif)
+    ) {
+      orientation = atoi(&exif[0]);
+    }
+    return orientation;
+  }
+
+  /*
+    Returns the window size for the named interpolator. For example,
+    a window size of 3 means a 3x3 pixel grid is used for the calculation.
+  */
+  int InterpolatorWindowSize(char const *name) {
+    VipsInterpolate *interpolator = vips_interpolate_new(name);
+    int window_size = vips_interpolate_get_window_size(interpolator);
+    g_object_unref(interpolator);
+    return window_size;
+  }
+
+} // namespace sharp
--- a/src/common.h
+++ b/src/common.h
@@ -1,46 +1,71 @@
-#ifndef SHARP_COMMON_H
-#define SHARP_COMMON_H
+#ifndef SRC_COMMON_H_
+#define SRC_COMMON_H_

-typedef enum {
-  UNKNOWN,
-  JPEG,
-  PNG,
-  WEBP,
-  TIFF,
-  MAGICK
-} ImageType;
+namespace sharp {

-// Filename extension checkers
-bool is_jpeg(std::string const &str);
-bool is_png(std::string const &str);
-bool is_webp(std::string const &str);
-bool is_tiff(std::string const &str);
+  enum class ImageType {
+    UNKNOWN,
+    JPEG,
+    PNG,
+    WEBP,
+    TIFF,
+    MAGICK
+  };

-// How many tasks are in the queue?
-extern volatile int counter_queue;
+  // How many tasks are in the queue?
+  extern volatile int counterQueue;

-// How many tasks are being processed?
-extern volatile int counter_process;
+  // How many tasks are being processed?
+  extern volatile int counterProcess;

-/*
-  Initialise a VipsImage from a buffer. Supports JPEG, PNG and WebP.
-  Returns the ImageType detected, if any.
-*/
-ImageType
-sharp_init_image_from_buffer(VipsImage **image, void *buffer, size_t const length, VipsAccess const access);
+  // Filename extension checkers
+  bool IsJpeg(std::string const &str);
+  bool IsPng(std::string const &str);
+  bool IsWebp(std::string const &str);
+  bool IsTiff(std::string const &str);

-/*
-  Initialise a VipsImage from a file.
-  Returns the ImageType detected, if any.
-*/
-ImageType
-sharp_init_image_from_file(VipsImage **image, char const *file, VipsAccess const access);
+  /*
+    Determine image format of a buffer.
+  */
+  ImageType DetermineImageType(void *buffer, size_t const length);

-/*
-  Does this image have an alpha channel?
-  Uses colour space interpretation with number of channels to guess this.
-*/
-bool
-sharp_image_has_alpha(VipsImage *image);
+  /*
+    Determine image format of a file.
+  */
+  ImageType DetermineImageType(char const *file);

-#endif
+  /*
+    Initialise and return a VipsImage from a buffer. Supports JPEG, PNG, WebP and TIFF.
+  */
+  VipsImage* InitImage(ImageType imageType, void *buffer, size_t const length, VipsAccess const access);
+
+  /*
+    Initialise and return a VipsImage from a file.
+  */
+  VipsImage* InitImage(ImageType imageType, char const *file, VipsAccess const access);
+
+  /*
+    Does this image have an embedded profile?
+  */
+  bool HasProfile(VipsImage *image);
+
+  /*
+    Does this image have an alpha channel?
+    Uses colour space interpretation with number of channels to guess this.
+  */
+  bool HasAlpha(VipsImage *image);
+
+  /*
+    Get EXIF Orientation of image, if any.
+  */
+  int ExifOrientation(VipsImage const *image);
+
+  /*
+    Returns the window size for the named interpolator. For example,
+    a window size of 3 means a 3x3 pixel grid is used for the calculation.
+  */
+  int InterpolatorWindowSize(char const *name);
+
+}  // namespace sharp
+
+#endif  // SRC_COMMON_H_
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -6,7 +6,23 @@
 #include "common.h"
 #include "metadata.h"

-using namespace v8;
+using v8::Handle;
+using v8::Local;
+using v8::Value;
+using v8::Object;
+using v8::Number;
+using v8::String;
+using v8::Boolean;
+using v8::Function;
+using v8::Exception;
+
+using sharp::ImageType;
+using sharp::DetermineImageType;
+using sharp::InitImage;
+using sharp::HasProfile;
+using sharp::HasAlpha;
+using sharp::ExifOrientation;
+using sharp::counterQueue;

 struct MetadataBaton {
  // Input
@@ -19,6 +35,7 @@ struct MetadataBaton {
  int height;
  std::string space;
  int channels;
+  bool hasProfile;
  bool hasAlpha;
  int orientation;
  std::string err;
@@ -36,49 +53,58 @@ class MetadataWorker : public NanAsyncWorker {

  void Execute() {
    // Decrement queued task counter
-    g_atomic_int_dec_and_test(&counter_queue);
+    g_atomic_int_dec_and_test(&counterQueue);

-    ImageType imageType = UNKNOWN;
-    VipsImage *image;
+    ImageType imageType = ImageType::UNKNOWN;
+    VipsImage *image = NULL;
    if (baton->bufferInLength > 1) {
      // From buffer
-      imageType = sharp_init_image_from_buffer(&image, baton->bufferIn, baton->bufferInLength, VIPS_ACCESS_RANDOM);
-      if (imageType == UNKNOWN) {
+      imageType = DetermineImageType(baton->bufferIn, baton->bufferInLength);
+      if (imageType != ImageType::UNKNOWN) {
+        image = InitImage(imageType, baton->bufferIn, baton->bufferInLength, VIPS_ACCESS_RANDOM);
+        if (image == NULL) {
+          (baton->err).append("Input buffer has corrupt header");
+          imageType = ImageType::UNKNOWN;
+        }
+      } else {
        (baton->err).append("Input buffer contains unsupported image format");
      }
    } else {
      // From file
-      imageType = sharp_init_image_from_file(&image, baton->fileIn.c_str(), VIPS_ACCESS_RANDOM);
-      if (imageType == UNKNOWN) {
-        (baton->err).append("File is of an unsupported image format");
+      imageType = DetermineImageType(baton->fileIn.c_str());
+      if (imageType != ImageType::UNKNOWN) {
+        image = InitImage(imageType, baton->fileIn.c_str(), VIPS_ACCESS_RANDOM);
+        if (image == NULL) {
+          (baton->err).append("Input file has corrupt header");
+          imageType = ImageType::UNKNOWN;
+        }
+      } else {
+        (baton->err).append("Input file is of an unsupported image format");
      }
    }
-    if (imageType != UNKNOWN) {
+    if (image != NULL && imageType != ImageType::UNKNOWN) {
      // Image type
      switch (imageType) {
-        case JPEG: baton->format = "jpeg"; break;
-        case PNG: baton->format = "png"; break;
-        case WEBP: baton->format = "webp"; break;
-        case TIFF: baton->format = "tiff"; break;
-        case MAGICK: baton->format = "magick"; break;
-        case UNKNOWN: default: baton->format = "";
+        case ImageType::JPEG: baton->format = "jpeg"; break;
+        case ImageType::PNG: baton->format = "png"; break;
+        case ImageType::WEBP: baton->format = "webp"; break;
+        case ImageType::TIFF: baton->format = "tiff"; break;
+        case ImageType::MAGICK: baton->format = "magick"; break;
+        case ImageType::UNKNOWN: break;
      }
      // VipsImage attributes
      baton->width = image->Xsize;
      baton->height = image->Ysize;
      baton->space = vips_enum_nick(VIPS_TYPE_INTERPRETATION, image->Type);
      baton->channels = image->Bands;
-      baton->hasAlpha = sharp_image_has_alpha(image);
-      // EXIF Orientation
-      const char *exif;
-      if (!vips_image_get_string(image, "exif-ifd0-Orientation", &exif)) {
-        baton->orientation = atoi(&exif[0]);
-      }
-    }
-    // Clean up
-    if (imageType != UNKNOWN) {
+      baton->hasProfile = HasProfile(image);
+      // Derived attributes
+      baton->hasAlpha = HasAlpha(image);
+      baton->orientation = ExifOrientation(image);
+      // Drop image reference
      g_object_unref(image);
    }
+    // Clean up
    vips_error_clear();
    vips_thread_shutdown();
  }
@@ -98,6 +124,7 @@ class MetadataWorker : public NanAsyncWorker {
      info->Set(NanNew<String>("height"), NanNew<Number>(baton->height));
      info->Set(NanNew<String>("space"), NanNew<String>(baton->space));
      info->Set(NanNew<String>("channels"), NanNew<Number>(baton->channels));
+      info->Set(NanNew<String>("hasProfile"), NanNew<Boolean>(baton->hasProfile));
      info->Set(NanNew<String>("hasAlpha"), NanNew<Boolean>(baton->hasAlpha));
      if (baton->orientation > 0) {
        info->Set(NanNew<String>("orientation"), NanNew<Number>(baton->orientation));
@@ -138,7 +165,7 @@ NAN_METHOD(metadata) {
  NanAsyncQueueWorker(new MetadataWorker(callback, baton));

  // Increment queued task counter
-  g_atomic_int_inc(&counter_queue);
+  g_atomic_int_inc(&counterQueue);

  NanReturnUndefined();
 }
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -1,8 +1,8 @@
-#ifndef SHARP_METADATA_H
-#define SHARP_METADATA_H
+#ifndef SRC_METADATA_H_
+#define SRC_METADATA_H_

 #include "nan.h"

 NAN_METHOD(metadata);

-#endif
+#endif  // SRC_METADATA_H_
--- a/src/resize.cc
+++ b/src/resize.cc
--- a/src/resize.h
+++ b/src/resize.h
@@ -1,8 +1,8 @@
-#ifndef SHARP_RESIZE_H
-#define SHARP_RESIZE_H
+#ifndef SRC_RESIZE_H_
+#define SRC_RESIZE_H_

 #include "nan.h"

 NAN_METHOD(resize);

-#endif
+#endif  // SRC_RESIZE_H_
--- a/src/sharp.cc
+++ b/src/sharp.cc
@@ -8,17 +8,9 @@
 #include "resize.h"
 #include "utilities.h"

-using namespace v8;
-
-static void at_exit(void* arg) {
-  NanScope();
-  vips_shutdown();
-}
-
-extern "C" void init(Handle<Object> target) {
+extern "C" void init(v8::Handle<v8::Object> target) {
  NanScope();
  vips_init("sharp");
-  node::AtExit(at_exit);

  // Set libvips operation cache limits
  vips_cache_set_max_mem(100 * 1048576); // 100 MB
@@ -33,6 +25,7 @@ extern "C" void init(Handle<Object> target) {
  NODE_SET_METHOD(target, "cache", cache);
  NODE_SET_METHOD(target, "concurrency", concurrency);
  NODE_SET_METHOD(target, "counters", counters);
+  NODE_SET_METHOD(target, "libvipsVersion", libvipsVersion);
 }

 NODE_MODULE(sharp, init)
--- a/src/utilities.cc
+++ b/src/utilities.cc
@@ -6,7 +6,13 @@
 #include "common.h"
 #include "utilities.h"

-using namespace v8;
+using v8::Local;
+using v8::Object;
+using v8::Number;
+using v8::String;
+
+using sharp::counterQueue;
+using sharp::counterProcess;

 /*
  Get and set cache memory and item limits
@@ -58,7 +64,17 @@ NAN_METHOD(concurrency) {
 NAN_METHOD(counters) {
  NanScope();
  Local<Object> counters = NanNew<Object>();
-  counters->Set(NanNew<String>("queue"), NanNew<Number>(counter_queue));
-  counters->Set(NanNew<String>("process"), NanNew<Number>(counter_process));
+  counters->Set(NanNew<String>("queue"), NanNew<Number>(counterQueue));
+  counters->Set(NanNew<String>("process"), NanNew<Number>(counterProcess));
  NanReturnValue(counters);
 }
+
+/*
+  Get libvips version
+*/
+NAN_METHOD(libvipsVersion) {
+  NanScope();
+  char version[9];
+  snprintf(version, sizeof(version), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
+  NanReturnValue(NanNew<String>(version));
+}
--- a/src/utilities.h
+++ b/src/utilities.h
@@ -1,10 +1,11 @@
-#ifndef SHARP_UTILITIES_H
-#define SHARP_UTILITIES_H
+#ifndef SRC_UTILITIES_H_
+#define SRC_UTILITIES_H_

 #include "nan.h"

 NAN_METHOD(cache);
 NAN_METHOD(concurrency);
 NAN_METHOD(counters);
+NAN_METHOD(libvipsVersion);

-#endif
+#endif  // SRC_UTILITIES_H_
--- a/test/bench/package.json
+++ b/test/bench/package.json
@@ -9,9 +9,10 @@
  },
  "devDependencies": {
    "imagemagick": "^0.1.3",
-    "imagemagick-native": "^1.4.0",
-    "gm": "^1.16.0",
+    "imagemagick-native": "^1.6.0",
+    "gm": "^1.17.0",
    "async": "^0.9.0",
+    "semver": "^4.2.0",
    "benchmark": "^1.0.0"
  },
  "license": "Apache 2.0",
--- a/test/bench/perf.js
+++ b/test/bench/perf.js
@@ -5,6 +5,7 @@ var fs = require('fs');
 var async = require('async');
 var assert = require('assert');
 var Benchmark = require('benchmark');
+var semver = require('semver');

 var imagemagick = require('imagemagick');
 var imagemagickNative = require('imagemagick-native');
@@ -16,6 +17,9 @@ var fixtures = require('../fixtures');
 var width = 720;
 var height = 480;

+// Approximately equivalent to fast bilinear
+var magickFilter = 'Triangle';
+
 // Disable libvips cache to ensure tests are as fair as they can be
 sharp.cache(0);

@@ -30,7 +34,9 @@ async.series({
          dstPath: fixtures.outputJpg,
          quality: 0.8,
          width: width,
-          height: height
+          height: height,
+          format: 'jpg',
+          filter: magickFilter
        }, function(err) {
          if (err) {
            throw err;
@@ -47,55 +53,78 @@ async.series({
          quality: 80,
          width: width,
          height: height,
-          format: 'JPEG'
+          format: 'JPEG',
+          filter: magickFilter
+        }, function (err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
        });
-        deferred.resolve();
      }
    }).add('gm-buffer-file', {
      defer: true,
      fn: function(deferred) {
-        gm(inputJpgBuffer).resize(width, height).quality(80).write(fixtures.outputJpg, function (err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
+        gm(inputJpgBuffer)
+          .resize(width, height)
+          .filter(magickFilter)
+          .quality(80)
+          .write(fixtures.outputJpg, function (err) {
+            if (err) {
+              throw err;
+            } else {
+              deferred.resolve();
+            }
+          });
      }
    }).add('gm-buffer-buffer', {
      defer: true,
      fn: function(deferred) {
-        gm(inputJpgBuffer).resize(width, height).quality(80).toBuffer(function (err, buffer) {
-          if (err) {
-            throw err;
-          } else {
-            assert.notStrictEqual(null, buffer);
-            deferred.resolve();
-          }
-        });
+        gm(inputJpgBuffer)
+          .resize(width, height)
+          .filter(magickFilter)
+          .quality(80)
+          .toBuffer(function (err, buffer) {
+            if (err) {
+              throw err;
+            } else {
+              assert.notStrictEqual(null, buffer);
+              deferred.resolve();
+            }
+          });
      }
    }).add('gm-file-file', {
      defer: true,
      fn: function(deferred) {
-        gm(fixtures.inputJpg).resize(width, height).quality(80).write(fixtures.outputJpg, function (err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
+        gm(fixtures.inputJpg)
+          .resize(width, height)
+          .filter(magickFilter)
+          .quality(80)
+          .write(fixtures.outputJpg, function (err) {
+            if (err) {
+              throw err;
+            } else {
+              deferred.resolve();
+            }
+          });
      }
    }).add('gm-file-buffer', {
      defer: true,
      fn: function(deferred) {
-        gm(fixtures.inputJpg).resize(width, height).quality(80).toBuffer(function (err, buffer) {
-          if (err) {
-            throw err;
-          } else {
-            assert.notStrictEqual(null, buffer);
-            deferred.resolve();
-          }
-        });
+        gm(fixtures.inputJpg)
+          .resize(width, height)
+          .filter(magickFilter)
+          .quality(80)
+          .toBuffer(function (err, buffer) {
+            if (err) {
+              throw err;
+            } else {
+              assert.notStrictEqual(null, buffer);
+              deferred.resolve();
+            }
+          });
      }
    }).add('sharp-buffer-file', {
      defer: true,
@@ -162,7 +191,7 @@ async.series({
          deferred.resolve();
        });
      }
-    }).add('sharp-sharpen', {
+    }).add('sharp-sharpen-mild', {
      defer: true,
      fn: function(deferred) {
        sharp(inputJpgBuffer).resize(width, height).sharpen().toBuffer(function(err, buffer) {
@@ -174,6 +203,42 @@ async.series({
          }
        });
      }
+    }).add('sharp-sharpen-radius', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).sharpen(3, 1, 3).toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-blur-mild', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).blur().toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-blur-radius', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).blur(3).toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
    }).add('sharp-nearest-neighbour', {
      defer: true,
      fn: function(deferred) {
@@ -314,14 +379,17 @@ async.series({
  },
  png: function(callback) {
    var inputPngBuffer = fs.readFileSync(fixtures.inputPng);
-    (new Benchmark.Suite('png')).add('imagemagick-file-file', {
+    var pngSuite = new Benchmark.Suite('png');
+    pngSuite.add('imagemagick-file-file', {
      defer: true,
      fn: function(deferred) {
        imagemagick.resize({
          srcPath: fixtures.inputPng,
          dstPath: fixtures.outputPng,
          width: width,
-          height: height
+          height: height,
+          format: 'jpg',
+          filter: magickFilter
        }, function(err) {
          if (err) {
            throw err;
@@ -337,32 +405,39 @@ async.series({
          srcData: inputPngBuffer,
          width: width,
          height: height,
-          format: 'PNG'
+          format: 'PNG',
+          filter: magickFilter
        });
        deferred.resolve();
      }
    }).add('gm-file-file', {
      defer: true,
      fn: function(deferred) {
-        gm(fixtures.inputPng).resize(width, height).write(fixtures.outputPng, function (err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
+        gm(fixtures.inputPng)
+          .resize(width, height)
+          .filter(magickFilter)
+          .write(fixtures.outputPng, function (err) {
+            if (err) {
+              throw err;
+            } else {
+              deferred.resolve();
+            }
+          });
      }
    }).add('gm-file-buffer', {
      defer: true,
      fn: function(deferred) {
-        gm(fixtures.inputPng).resize(width, height).quality(80).toBuffer(function (err, buffer) {
-          if (err) {
-            throw err;
-          } else {
-            assert.notStrictEqual(null, buffer);
-            deferred.resolve();
-          }
-        });
+        gm(fixtures.inputPng)
+          .resize(width, height)
+          .filter(magickFilter)
+          .toBuffer(function (err, buffer) {
+            if (err) {
+              throw err;
+            } else {
+              assert.notStrictEqual(null, buffer);
+              deferred.resolve();
+            }
+          });
      }
    }).add('sharp-buffer-file', {
      defer: true,
@@ -422,7 +497,23 @@ async.series({
          }
        });
      }
-    }).on('cycle', function(event) {
+    });
+    if (semver.gte(sharp.libvipsVersion(), '7.41.0')) {
+      pngSuite.add('sharp-withoutAdaptiveFiltering', {
+        defer: true,
+        fn: function(deferred) {
+          sharp(inputPngBuffer).resize(width, height).withoutAdaptiveFiltering().toBuffer(function(err, buffer) {
+            if (err) {
+              throw err;
+            } else {
+              assert.notStrictEqual(null, buffer);
+              deferred.resolve();
+            }
+          });
+        }
+      });
+    }
+    pngSuite.on('cycle', function(event) {
      console.log(' png ' + String(event.target));
    }).on('complete', function() {
      callback(null, this.filter('fastest').pluck('name'));
--- a/test/bench/random.js
+++ b/test/bench/random.js
@@ -12,7 +12,7 @@ var min = 320;
 var max = 960;

 var randomDimension = function() {
-  return Math.random() * (max - min) + min;
+  return Math.ceil(Math.random() * (max - min) + min);
 };

 new Benchmark.Suite('random').add('imagemagick', {
--- a/test/fixtures/2569067123_aca715a2ee_o.jpg
+++ b/test/fixtures/2569067123_aca715a2ee_o.jpg
--- a/test/fixtures/Channel_digital_image_CMYK_color_no_profile.jpg
+++ b/test/fixtures/Channel_digital_image_CMYK_color_no_profile.jpg
--- a/test/fixtures/Wikimedia-logo.svg
+++ b/test/fixtures/Wikimedia-logo.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+   id="Wikimedia logo"
+   viewBox="-599 -599 1198 1198" width="1024" height="1024">
+<defs>
+  <clipPath id="mask">
+    <path d="M 47.5,-87.5 v 425 h -95 v -425 l -552,-552 v 1250 h 1199 v -1250 z" />
+  </clipPath>
+</defs>
+<g clip-path="url(#mask)">
+  <circle id="green parts" fill="#396" r="336.5"/>
+  <circle id="blue arc" fill="none" stroke="#069" r="480.25" stroke-width="135.5" />
+</g>
+<circle fill="#900" cy="-379.5" r="184.5" id="red circle"/>
+</svg>
--- a/test/fixtures/corrupt-header.jpg
+++ b/test/fixtures/corrupt-header.jpg
--- a/test/fixtures/free-gearhead-pack.psd
+++ b/test/fixtures/free-gearhead-pack.psd
--- a/test/fixtures/index.js
+++ b/test/fixtures/index.js
@@ -13,6 +13,8 @@ module.exports = {
  inputJpgWithExifMirroring: getPath('Landscape_5.jpg'), // https://github.com/recurser/exif-orientation-examples/blob/master/Landscape_5.jpg
  inputJpgWithGammaHoliness: getPath('gamma_dalai_lama_gray.jpg'), // http://www.4p8.com/eric.brasseur/gamma.html
  inputJpgWithCmykProfile: getPath('Channel_digital_image_CMYK_color.jpg'), // http://en.wikipedia.org/wiki/File:Channel_digital_image_CMYK_color.jpg
+  inputJpgWithCmykNoProfile: getPath('Channel_digital_image_CMYK_color_no_profile.jpg'),
+  inputJpgWithCorruptHeader: getPath('corrupt-header.jpg'),

  inputPng: getPath('50020484-00001.png'), // http://c.searspartsdirect.com/lis_png/PLDM/50020484-00001.png
  inputPngWithTransparency: getPath('blackbug.png'), // public domain
@@ -20,6 +22,8 @@ module.exports = {
  inputWebP: getPath('4.webp'), // http://www.gstatic.com/webp/gallery/4.webp
  inputTiff: getPath('G31D.TIF'), // http://www.fileformat.info/format/tiff/sample/e6c9a6e5253348f4aef6d17b534360ab/index.htm
  inputGif: getPath('Crash_test.gif'), // http://upload.wikimedia.org/wikipedia/commons/e/e3/Crash_test.gif
+  inputSvg: getPath('Wikimedia-logo.svg'), // http://commons.wikimedia.org/wiki/File:Wikimedia-logo.svg
+  inputPsd: getPath('free-gearhead-pack.psd'), // https://dribbble.com/shots/1624241-Free-Gearhead-Vector-Pack

  outputJpg: getPath('output.jpg'),
  outputPng: getPath('output.png'),
--- a/test/leak/leak.sh
+++ b/test/leak/leak.sh
@@ -5,4 +5,4 @@ fi

 curl -O https://raw.githubusercontent.com/jcupitt/libvips/master/libvips.supp test/leak/libvips.supp
 cd ../../
-G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --suppressions=test/leak/libvips.supp --suppressions=test/leak/sharp.supp --leak-check=full --show-leak-kinds=definite,indirect,possible --num-callers=20 npm test
+G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --suppressions=test/leak/libvips.supp --suppressions=test/leak/sharp.supp --leak-check=full --show-leak-kinds=definite,indirect,possible --num-callers=20 --trace-children=yes npm test
--- a/test/unit/alpha.js
+++ b/test/unit/alpha.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Alpha transparency', function() {

  it('Flatten to black', function(done) {
--- a/test/unit/blur.js
+++ b/test/unit/blur.js
@@ -0,0 +1,100 @@
+'use strict';
+
+var assert = require('assert');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+sharp.cache(0);
+
+describe('Blur', function() {
+
+  it('specific radius 1', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .blur(1)
+      .toFile(fixtures.path('output.blur-1.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('specific radius 10', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .blur(10)
+      .toFile(fixtures.path('output.blur-10.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('specific radius 0.3', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .blur(0.3)
+      .toFile(fixtures.path('output.blur-0.3.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('mild blur', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .blur()
+      .toFile(fixtures.path('output.blur-mild.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('invalid radius', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).blur(0.1);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('blurred image is smaller than non-blurred', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .blur(false)
+      .toBuffer(function(err, notBlurred, info) {
+        if (err) throw err;
+        assert.strictEqual(true, notBlurred.length > 0);
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        sharp(fixtures.inputJpg)
+          .resize(320, 240)
+          .blur(true)
+          .toBuffer(function(err, blurred, info) {
+            if (err) throw err;
+            assert.strictEqual(true, blurred.length > 0);
+            assert.strictEqual(true, blurred.length < notBlurred.length);
+            assert.strictEqual('jpeg', info.format);
+            assert.strictEqual(320, info.width);
+            assert.strictEqual(240, info.height);
+            done();
+          });
+      });
+  });
+
+});
--- a/test/unit/colourspace.js
+++ b/test/unit/colourspace.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Colour space conversion', function() {

  it('To greyscale', function(done) {
@@ -66,4 +68,16 @@ describe('Colour space conversion', function() {
      });
  });

+  it('From profile-less CMYK to sRGB', function(done) {
+    sharp(fixtures.inputJpgWithCmykNoProfile)
+      .resize(320)
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        done();
+      });
+  });
+
 });
--- a/test/unit/cpplint.js
+++ b/test/unit/cpplint.js
@@ -0,0 +1,46 @@
+'use strict';
+
+var fs = require('fs');
+var path = require('path');
+var assert = require('assert');
+
+var cpplint = require('node-cpplint/lib/');
+
+describe('cpplint', function() {
+
+  // List C++ source files
+  fs.readdirSync(path.join(__dirname, '..', '..', 'src')).forEach(function (source) {
+    var file = path.join('src', source);
+    it(file, function(done) {
+      // Lint each source file
+      cpplint({
+        files: [file],
+        linelength: 140,
+        filters: {
+          legal: {
+            copyright: false
+          },
+          build: {
+            include: false,
+            include_order: false
+          },
+          whitespace: {
+            blank_line: false,
+            comments: false,
+            parens: false
+          }
+        }
+      }, function(err, report) {
+        if (err) {
+          throw err;
+        }
+        var expected = {};
+        expected[file] = [];
+        assert.deepEqual(expected, report);
+        done();
+      });
+    });
+
+  });
+
+});
--- a/test/unit/crop.js
+++ b/test/unit/crop.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Crop gravities', function() {

  it('North', function(done) {
--- a/test/unit/embed.js
+++ b/test/unit/embed.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Embed', function() {

  it('JPEG within PNG, no alpha channel', function(done) {
--- a/test/unit/extract.js
+++ b/test/unit/extract.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Partial image extraction', function() {

  it('JPEG', function(done) {
@@ -90,4 +92,86 @@ describe('Partial image extraction', function() {
      });
  });

+  it('Extract then rotate', function(done) {
+    sharp(fixtures.inputJpg)
+      .extract(10, 10, 100, 100)
+      .rotate(90)
+      .toFile(fixtures.path('output.extract.extract-then-rotate.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(100, info.width);
+        assert.strictEqual(100, info.height);
+        done();
+      });
+  });
+
+  it('Rotate then extract', function(done) {
+    sharp(fixtures.inputJpg)
+      .rotate(90)
+      .extract(10, 10, 100, 100)
+      .toFile(fixtures.path('output.extract.rotate-then-extract.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(100, info.width);
+        assert.strictEqual(100, info.height);
+        done();
+      });
+  });
+
+  describe('Invalid parameters', function() {
+
+    it('Undefined', function(done) {
+      var isValid = true;
+      try {
+        sharp(fixtures.inputJpg).extract();
+      } catch (err) {
+        isValid = false;
+      }
+      assert.strictEqual(false, isValid);
+      done();
+    });
+
+    it('String top', function(done) {
+      var isValid = true;
+      try {
+        sharp(fixtures.inputJpg).extract('spoons', 10, 10, 10);
+      } catch (err) {
+        isValid = false;
+      }
+      assert.strictEqual(false, isValid);
+      done();
+    });
+
+    it('Non-integral left', function(done) {
+      var isValid = true;
+      try {
+        sharp(fixtures.inputJpg).extract(10, 10.2, 10, 10);
+      } catch (err) {
+        isValid = false;
+      }
+      assert.strictEqual(false, isValid);
+      done();
+    });
+
+    it('Negative width - negative', function(done) {
+      var isValid = true;
+      try {
+        sharp(fixtures.inputJpg).extract(10, 10, -10, 10);
+      } catch (err) {
+        isValid = false;
+      }
+      assert.strictEqual(false, isValid);
+      done();
+    });
+
+    it('Null height', function(done) {
+      var isValid = true;
+      try {
+        sharp(fixtures.inputJpg).extract(10, 10, 10, null);
+      } catch (err) {
+        isValid = false;
+      }
+      assert.strictEqual(false, isValid);
+      done();
+    });
+
+  });
 });
--- a/test/unit/gamma.js
+++ b/test/unit/gamma.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Gamma correction', function() {

  it('value of 0.0 (disabled)', function(done) {
--- a/test/unit/interpolation.js
+++ b/test/unit/interpolation.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Interpolation', function() {

  it('nearest neighbour', function(done) {
--- a/test/unit/io.js
+++ b/test/unit/io.js
@@ -3,9 +3,13 @@
 var fs = require('fs');
 var assert = require('assert');

+var semver = require('semver');
+
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Input/output', function() {

  it('Read from File and write to Stream', function(done) {
@@ -14,6 +18,7 @@ describe('Input/output', function() {
      sharp(fixtures.outputJpg).toBuffer(function(err, data, info) {
        if (err) throw err;
        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(240, info.height);
@@ -31,6 +36,7 @@ describe('Input/output', function() {
      sharp(fixtures.outputJpg).toBuffer(function(err, data, info) {
        if (err) throw err;
        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(240, info.height);
@@ -45,6 +51,7 @@ describe('Input/output', function() {
    var readable = fs.createReadStream(fixtures.inputJpg);
    var pipeline = sharp().resize(320, 240).toFile(fixtures.outputJpg, function(err, info) {
      if (err) throw err;
+      assert.strictEqual(true, info.size > 0);
      assert.strictEqual('jpeg', info.format);
      assert.strictEqual(320, info.width);
      assert.strictEqual(240, info.height);
@@ -59,6 +66,7 @@ describe('Input/output', function() {
    var pipeline = sharp().resize(320, 240).toBuffer(function(err, data, info) {
      if (err) throw err;
      assert.strictEqual(true, data.length > 0);
+      assert.strictEqual(data.length, info.size);
      assert.strictEqual('jpeg', info.format);
      assert.strictEqual(320, info.width);
      assert.strictEqual(240, info.height);
@@ -86,6 +94,7 @@ describe('Input/output', function() {
      sharp(fixtures.outputJpg).toBuffer(function(err, data, info) {
        if (err) throw err;
        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(240, info.height);
@@ -133,6 +142,7 @@ describe('Input/output', function() {
      .toBuffer(function(err, data, info) {
        if (err) throw err;
        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(240, info.height);
@@ -147,6 +157,7 @@ describe('Input/output', function() {
      .toBuffer(function(err, data, info) {
        if (err) throw err;
        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(240, info.height);
@@ -217,6 +228,7 @@ describe('Input/output', function() {
      sharp(data).toBuffer(function(err, data, info) {
        if (err) throw err;
        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(240, info.height);
@@ -258,31 +270,50 @@ describe('Input/output', function() {
      .resize(320, 240)
      .png()
      .progressive(false)
-      .toBuffer(function(err, nonProgressive, info) {
+      .toBuffer(function(err, nonProgressiveData, nonProgressiveInfo) {
        if (err) throw err;
-        assert.strictEqual(true, nonProgressive.length > 0);
-        assert.strictEqual('png', info.format);
-        assert.strictEqual(320, info.width);
-        assert.strictEqual(240, info.height);
-        sharp(nonProgressive)
+        assert.strictEqual(true, nonProgressiveData.length > 0);
+        assert.strictEqual(nonProgressiveData.length, nonProgressiveInfo.size);
+        assert.strictEqual('png', nonProgressiveInfo.format);
+        assert.strictEqual(320, nonProgressiveInfo.width);
+        assert.strictEqual(240, nonProgressiveInfo.height);
+        sharp(nonProgressiveData)
          .progressive()
-          .toBuffer(function(err, progressive, info) {
+          .toBuffer(function(err, progressiveData, progressiveInfo) {
            if (err) throw err;
-            assert.strictEqual(true, progressive.length > 0);
-            assert.strictEqual(true, progressive.length > nonProgressive.length);
-            assert.strictEqual('png', info.format);
-            assert.strictEqual(320, info.width);
-            assert.strictEqual(240, info.height);
+            assert.strictEqual(true, progressiveData.length > 0);
+            assert.strictEqual(progressiveData.length, progressiveInfo.size);
+            assert.strictEqual(true, progressiveData.length > nonProgressiveData.length);
+            assert.strictEqual('png', progressiveInfo.format);
+            assert.strictEqual(320, progressiveInfo.width);
+            assert.strictEqual(240, progressiveInfo.height);
            done();
          });
      });
  });

+  it('File input with corrupt header fails gracefully', function(done) {
+    sharp(fixtures.inputJpgWithCorruptHeader)
+      .toBuffer(function(err) {
+        assert.strictEqual(true, !!err);
+        done();
+      });
+  });
+
+  it('Buffer input with corrupt header fails gracefully', function(done) {
+    sharp(fs.readFileSync(fixtures.inputJpgWithCorruptHeader))
+      .toBuffer(function(err) {
+        assert.strictEqual(true, !!err);
+        done();
+      });
+  });
+
  describe('Output filename without extension uses input format', function() {

    it('JPEG', function(done) {
      sharp(fixtures.inputJpg).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
        if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(80, info.height);
@@ -294,6 +325,7 @@ describe('Input/output', function() {
    it('PNG', function(done) {
      sharp(fixtures.inputPng).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
        if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
        assert.strictEqual('png', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(80, info.height);
@@ -305,6 +337,7 @@ describe('Input/output', function() {
    it('Transparent PNG', function(done) {
      sharp(fixtures.inputPngWithTransparency).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
        if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
        assert.strictEqual('png', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(80, info.height);
@@ -315,6 +348,7 @@ describe('Input/output', function() {
    it('WebP', function(done) {
      sharp(fixtures.inputWebP).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
        if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
        assert.strictEqual('webp', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(80, info.height);
@@ -326,6 +360,7 @@ describe('Input/output', function() {
    it('TIFF', function(done) {
      sharp(fixtures.inputTiff).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
        if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
        assert.strictEqual('tiff', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(80, info.height);
@@ -343,9 +378,9 @@ describe('Input/output', function() {

  });

-  describe('PNG compression level', function() {
+  describe('PNG output', function() {

-    it('valid', function(done) {
+    it('compression level is valid', function(done) {
      var isValid = false;
      try {
        sharp().compressionLevel(0);
@@ -355,7 +390,7 @@ describe('Input/output', function() {
      done();
    });

-    it('invalid', function(done) {
+    it('compression level is invalid', function(done) {
      var isValid = false;
      try {
        sharp().compressionLevel(-1);
@@ -365,6 +400,199 @@ describe('Input/output', function() {
      done();
    });

+    if (semver.gte(sharp.libvipsVersion(), '7.42.0')) {
+      it('withoutAdaptiveFiltering generates smaller file [libvips ' + sharp.libvipsVersion() + '>=7.42.0]', function(done) {
+        // First generate with adaptive filtering
+        sharp(fixtures.inputPng)
+          .resize(320, 240)
+          .withoutAdaptiveFiltering(false)
+          .toBuffer(function(err, adaptiveData, adaptiveInfo) {
+            if (err) throw err;
+            assert.strictEqual(true, adaptiveData.length > 0);
+            assert.strictEqual(adaptiveData.length, adaptiveInfo.size);
+            assert.strictEqual('png', adaptiveInfo.format);
+            assert.strictEqual(320, adaptiveInfo.width);
+            assert.strictEqual(240, adaptiveInfo.height);
+            // Then generate without
+            sharp(fixtures.inputPng)
+              .resize(320, 240)
+              .withoutAdaptiveFiltering()
+              .toBuffer(function(err, withoutAdaptiveData, withoutAdaptiveInfo) {
+                if (err) throw err;
+                assert.strictEqual(true, withoutAdaptiveData.length > 0);
+                assert.strictEqual(withoutAdaptiveData.length, withoutAdaptiveInfo.size);
+                assert.strictEqual('png', withoutAdaptiveInfo.format);
+                assert.strictEqual(320, withoutAdaptiveInfo.width);
+                assert.strictEqual(240, withoutAdaptiveInfo.height);
+                assert.strictEqual(true, withoutAdaptiveData.length < adaptiveData.length);
+                done();
+              });
+          });
+      });
+    }
+
+  });
+
+  it('Convert SVG, if supported, to PNG', function(done) {
+    sharp(fixtures.inputSvg)
+      .resize(100, 100)
+      .png()
+      .toFile(fixtures.path('output.svg.png'), function(err, info) {
+        if (err) {
+          assert.strictEqual('Input file is of an unsupported image format', err.message);
+        } else {
+          assert.strictEqual(true, info.size > 0);
+          assert.strictEqual('png', info.format);
+          assert.strictEqual(100, info.width);
+          assert.strictEqual(100, info.height);
+        }
+        done();
+      });
+  });
+
+  it('Convert PSD to PNG', function(done) {
+    sharp(fixtures.inputPsd)
+      .resize(320, 240)
+      .png()
+      .toFile(fixtures.path('output.psd.png'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
+        assert.strictEqual('png', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  if (semver.gte(sharp.libvipsVersion(), '7.40.0')) {
+    it('Load TIFF from Buffer [libvips ' + sharp.libvipsVersion() + '>=7.40.0]', function(done) {
+      var inputTiffBuffer = fs.readFileSync(fixtures.inputTiff);
+      sharp(inputTiffBuffer)
+        .resize(320, 240)
+        .jpeg()
+        .toBuffer(function(err, data, info) {
+          if (err) throw err;
+          assert.strictEqual(true, data.length > 0);
+          assert.strictEqual(data.length, info.size);
+          assert.strictEqual('jpeg', info.format);
+          assert.strictEqual(320, info.width);
+          assert.strictEqual(240, info.height);
+          done();
+        });
+    });
+  }
+
+  if (semver.gte(sharp.libvipsVersion(), '7.42.0')) {
+    describe('Ouput raw, uncompressed image data [libvips ' + sharp.libvipsVersion() + '>=7.42.0]', function() {
+      it('1 channel greyscale image', function(done) {
+        sharp(fixtures.inputJpg)
+          .greyscale()
+          .resize(32, 24)
+          .raw()
+          .toBuffer(function(err, data, info) {
+            assert.strictEqual(32 * 24 * 1, info.size);
+            assert.strictEqual(data.length, info.size);
+            assert.strictEqual('raw', info.format);
+            assert.strictEqual(32, info.width);
+            assert.strictEqual(24, info.height);
+            done();
+          });
+      });
+      it('3 channel colour image without transparency', function(done) {
+        sharp(fixtures.inputJpg)
+          .resize(32, 24)
+          .raw()
+          .toBuffer(function(err, data, info) {
+            assert.strictEqual(32 * 24 * 3, info.size);
+            assert.strictEqual(data.length, info.size);
+            assert.strictEqual('raw', info.format);
+            assert.strictEqual(32, info.width);
+            assert.strictEqual(24, info.height);
+            done();
+          });
+      });
+      it('4 channel colour image with transparency', function(done) {
+        sharp(fixtures.inputPngWithTransparency)
+          .resize(32, 24)
+          .raw()
+          .toBuffer(function(err, data, info) {
+            assert.strictEqual(32 * 24 * 4, info.size);
+            assert.strictEqual(data.length, info.size);
+            assert.strictEqual('raw', info.format);
+            assert.strictEqual(32, info.width);
+            assert.strictEqual(24, info.height);
+            done();
+          });
+      });
+    });
+  }
+
+  describe('Limit pixel count of input image', function() {
+
+    it('Invalid fails - negative', function(done) {
+      var isValid = false;
+      try {
+        sharp().limitInputPixels(-1);
+        isValid = true;
+      } catch (e) {}
+      assert(!isValid);
+      done();
+    });
+
+    it('Invalid fails - float', function(done) {
+      var isValid = false;
+      try {
+        sharp().limitInputPixels(12.3);
+        isValid = true;
+      } catch (e) {}
+      assert(!isValid);
+      done();
+    });
+
+    it('Invalid fails - huge', function(done) {
+      var isValid = false;
+      try {
+        sharp().limitInputPixels(Math.pow(0x3FFF, 2) + 1);
+        isValid = true;
+      } catch (e) {}
+      assert(!isValid);
+      done();
+    });
+
+    it('Invalid fails - string', function(done) {
+      var isValid = false;
+      try {
+        sharp().limitInputPixels('fail');
+        isValid = true;
+      } catch (e) {}
+      assert(!isValid);
+      done();
+    });
+
+    it('Same size as input works', function(done) {
+      sharp(fixtures.inputJpg).metadata(function(err, metadata) {
+        if (err) throw err;
+        sharp(fixtures.inputJpg)
+          .limitInputPixels(metadata.width * metadata.height)
+          .toBuffer(function(err) {
+            assert.strictEqual(true, !err);
+            done();
+          });
+      });
+    });
+
+    it('Smaller than input fails', function(done) {
+      sharp(fixtures.inputJpg).metadata(function(err, metadata) {
+        if (err) throw err;
+        sharp(fixtures.inputJpg)
+          .limitInputPixels(metadata.width * metadata.height - 1)
+          .toBuffer(function(err) {
+            assert.strictEqual(true, !!err);
+            done();
+          });
+      });
+    });
+
  });

 });
--- a/test/unit/metadata.js
+++ b/test/unit/metadata.js
@@ -6,6 +6,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Image metadata', function() {

  it('JPEG', function(done) {
@@ -16,6 +18,8 @@ describe('Image metadata', function() {
      assert.strictEqual(2225, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
+      assert.strictEqual(false, metadata.hasAlpha);
      assert.strictEqual('undefined', typeof metadata.orientation);
      done();
    });
@@ -29,6 +33,7 @@ describe('Image metadata', function() {
      assert.strictEqual(600, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(true, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      assert.strictEqual(8, metadata.orientation);
      done();
@@ -43,6 +48,7 @@ describe('Image metadata', function() {
      assert.strictEqual(3248, metadata.height);
      assert.strictEqual('b-w', metadata.space);
      assert.strictEqual(1, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      done();
    });
@@ -56,6 +62,7 @@ describe('Image metadata', function() {
      assert.strictEqual(2074, metadata.height);
      assert.strictEqual('b-w', metadata.space);
      assert.strictEqual(1, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      done();
    });
@@ -69,6 +76,7 @@ describe('Image metadata', function() {
      assert.strictEqual(1536, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(4, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(true, metadata.hasAlpha);
      done();
    });
@@ -82,6 +90,7 @@ describe('Image metadata', function() {
      assert.strictEqual(772, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      done();
    });
@@ -94,6 +103,7 @@ describe('Image metadata', function() {
      assert.strictEqual(800, metadata.width);
      assert.strictEqual(533, metadata.height);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      done();
    });
@@ -106,11 +116,21 @@ describe('Image metadata', function() {
      assert.strictEqual(2225, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      done();
    });
  });

+  it('Non-existent file in, Promise out', function(done) {
+    sharp('fail').metadata().then(function(metadata) {
+      throw new Error('Non-existent file');
+    }, function (err) {
+      assert.ok(!!err);
+      done();
+    });
+  });
+
  it('Stream in, Promise out', function(done) {
    var readable = fs.createReadStream(fixtures.inputJpg);
    var pipeline = sharp();
@@ -120,6 +140,7 @@ describe('Image metadata', function() {
      assert.strictEqual(2225, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      done();
    }).catch(function(err) {
@@ -137,6 +158,7 @@ describe('Image metadata', function() {
      assert.strictEqual(2225, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
      done();
    });
@@ -152,8 +174,9 @@ describe('Image metadata', function() {
      assert.strictEqual(2225, metadata.height);
      assert.strictEqual('srgb', metadata.space);
      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasProfile);
      assert.strictEqual(false, metadata.hasAlpha);
-      image.resize(metadata.width / 2).toBuffer(function(err, data, info) {
+      image.resize(Math.floor(metadata.width / 2)).toBuffer(function(err, data, info) {
        if (err) throw err;
        assert.strictEqual(true, data.length > 0);
        assert.strictEqual(1362, info.width);
@@ -164,25 +187,49 @@ describe('Image metadata', function() {
  });

  it('Keep EXIF metadata after a resize', function(done) {
-    sharp(fixtures.inputJpgWithExif).resize(320, 240).withMetadata().toBuffer(function(err, buffer) {
-      if (err) throw err;
-      sharp(buffer).metadata(function(err, metadata) {
+    sharp(fixtures.inputJpgWithExif)
+      .resize(320, 240)
+      .withMetadata()
+      .toBuffer(function(err, buffer) {
        if (err) throw err;
-        assert.strictEqual(8, metadata.orientation);
-        done();
+        sharp(buffer).metadata(function(err, metadata) {
+          if (err) throw err;
+          assert.strictEqual(true, metadata.hasProfile);
+          assert.strictEqual(8, metadata.orientation);
+          done();
+        });
      });
-    });
  });

  it('Remove EXIF metadata after a resize', function(done) {
-    sharp(fixtures.inputJpgWithExif).resize(320, 240).withMetadata(false).toBuffer(function(err, buffer) {
-      if (err) throw err;
-      sharp(buffer).metadata(function(err, metadata) {
+    sharp(fixtures.inputJpgWithExif)
+      .resize(320, 240)
+      .withMetadata(false)
+      .toBuffer(function(err, buffer) {
        if (err) throw err;
-        assert.strictEqual('undefined', typeof metadata.orientation);
+        sharp(buffer).metadata(function(err, metadata) {
+          if (err) throw err;
+          assert.strictEqual(false, metadata.hasProfile);
+          assert.strictEqual('undefined', typeof metadata.orientation);
+          done();
+        });
+      });
+  });
+
+  it('File input with corrupt header fails gracefully', function(done) {
+    sharp(fixtures.inputJpgWithCorruptHeader)
+      .metadata(function(err) {
+        assert.strictEqual(true, !!err);
+        done();
+      });
+  });
+
+  it('Buffer input with corrupt header fails gracefully', function(done) {
+    sharp(fs.readFileSync(fixtures.inputJpgWithCorruptHeader))
+      .metadata(function(err) {
+        assert.strictEqual(true, !!err);
        done();
      });
-    });
  });

 });
--- a/test/unit/resize.js
+++ b/test/unit/resize.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Resize dimensions', function() {

  it('Exact crop', function(done) {
@@ -62,7 +64,7 @@ describe('Resize dimensions', function() {
    });
  });

-  it('Invalid width', function(done) {
+  it('Invalid width - NaN', function(done) {
    var isValid = true;
    try {
      sharp(fixtures.inputJpg).resize('spoons', 240);
@@ -73,7 +75,7 @@ describe('Resize dimensions', function() {
    done();
  });

-  it('Invalid height', function(done) {
+  it('Invalid height - NaN', function(done) {
    var isValid = true;
    try {
      sharp(fixtures.inputJpg).resize(320, 'spoons');
@@ -84,6 +86,50 @@ describe('Resize dimensions', function() {
    done();
  });

+  it('Invalid width - float', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).resize(1.5, 240);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('Invalid height - float', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).resize(320, 1.5);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('Invalid width - too large', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).resize(0x4000, 240);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('Invalid height - too large', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).resize(320, 0x4000);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
  it('TIFF embed known to cause rounding errors', function(done) {
    sharp(fixtures.inputTiff).resize(240, 320).embed().jpeg().toBuffer(function(err, data, info) {
      if (err) throw err;
--- a/test/unit/rotate.js
+++ b/test/unit/rotate.js
@@ -5,6 +5,8 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Rotation', function() {

  it('Rotate by 90 degrees, respecting output input size', function(done) {
@@ -68,6 +70,21 @@ describe('Rotation', function() {
    });
  });

+  it('Attempt to auto-rotate image format without EXIF support', function(done) {
+    sharp(fixtures.inputGif)
+      .rotate()
+      .resize(320)
+      .jpeg()
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(213, info.height);
+        done();
+      });
+  });
+
  it('Rotate to an invalid angle, should fail', function(done) {
    var fail = false;
    try {
--- a/test/unit/sharpen.js
+++ b/test/unit/sharpen.js
@@ -5,9 +5,96 @@ var assert = require('assert');
 var sharp = require('../../index');
 var fixtures = require('../fixtures');

+sharp.cache(0);
+
 describe('Sharpen', function() {

-  it('sharpen image is larger than non-sharpen', function(done) {
+  it('specific radius 10', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .sharpen(10)
+      .toFile(fixtures.path('output.sharpen-10.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('specific radius 3 and levels 0.5, 2.5', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .sharpen(3, 0.5, 2.5)
+      .toFile(fixtures.path('output.sharpen-3-0.5-2.5.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('specific radius 5 and levels 2, 4', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .sharpen(5, 2, 4)
+      .toFile(fixtures.path('output.sharpen-5-2-4.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('mild sharpen', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .sharpen()
+      .toFile(fixtures.path('output.sharpen-mild.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        done();
+      });
+  });
+
+  it('invalid radius', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).sharpen(1.5);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('invalid flat', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).sharpen(1, -1);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('invalid jagged', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).sharpen(1, 1, -1);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('sharpened image is larger than non-sharpened', function(done) {
    sharp(fixtures.inputJpg)
      .resize(320, 240)
      .sharpen(false)
@@ -17,8 +104,9 @@ describe('Sharpen', function() {
        assert.strictEqual('jpeg', info.format);
        assert.strictEqual(320, info.width);
        assert.strictEqual(240, info.height);
-        sharp(notSharpened)
-          .sharpen()
+        sharp(fixtures.inputJpg)
+          .resize(320, 240)
+          .sharpen(true)
          .toBuffer(function(err, sharpened, info) {
            if (err) throw err;
            assert.strictEqual(true, sharpened.length > 0);
Author	SHA1	Message	Date
Lovell Fuller	e5a5e2ca7e	Tighten 'extract' parameter validation #158	2015-01-29 22:46:04 +00:00
Lovell Fuller	797d503a99	Merge pull request #156 from jonathanong/patch-1 ⬇️ nan@^1.5.1	2015-01-28 22:04:52 +00:00
Jonathan Ong	512a281986	⬇️ nan@^1.5.1 1.6 breaks iojs. this lowers the minimum nan version so that developers can still do `nan@~1.5.1`.	2015-01-27 15:11:40 -08:00
Lovell Fuller	37c5ca7166	Skip SVG test when format is unavailable It's possible to compile *magick without SVG support	2015-01-25 11:34:16 +00:00
Lovell Fuller	cda700ef73	Update libmagick references to the C library	2015-01-23 11:00:39 +00:00
Lovell Fuller	d32901da8d	Dependency version bumps	2015-01-23 10:50:50 +00:00
Lovell Fuller	83ebe12061	Remove atexit handler as libvips defines this New grunt-sharp build tool Version bump for latest libvips	2015-01-22 14:17:20 +00:00
Lovell Fuller	fe34548bad	Remove optional AdjustAmountOfExternalAllocatedMemory #151 Isolate not available when deleting the buffer	2015-01-21 20:13:43 +00:00
Lovell Fuller	855945bef2	Delete input buffer on postclose #151 Notify V8 GC of memory (de)allocation	2015-01-21 10:34:03 +00:00
Lovell Fuller	8421e3aa5f	Add limitInputPixels option to reject input #115	2015-01-20 14:18:05 +00:00
Lovell Fuller	c93f79daa7	Guard against InitImage failure #150 Protects against truncated image headers	2015-01-20 10:38:44 +00:00
Lovell Fuller	35c53f78c8	Ensure bench/random test uses int dimensions	2015-01-16 22:31:46 +00:00
Lovell Fuller	c158d51f8b	Explicit cast to uint32 required for nan 1.5.x See rvagg/nan#229	2015-01-16 22:31:46 +00:00
Lovell Fuller	8e9a8dfede	Remove cpplint namespace-related warnings	2015-01-16 22:31:46 +00:00
Lovell Fuller	67dc694cfb	Link to new contributor guide Remove now-duplicate content	2015-01-16 22:31:46 +00:00
Lovell Fuller	74704a132c	Add a contribution guide to help those who help	2015-01-16 22:31:46 +00:00
Lovell Fuller	b86674f91f	Add cpplint to test suite	2015-01-16 22:31:46 +00:00
Lovell Fuller	5dab3c8482	Allow rotate before pre-resize extraction #145	2015-01-16 22:30:57 +00:00
Lovell Fuller	a190ae6b08	Add raw, uncompressed image data output #136	2015-01-16 22:28:24 +00:00
Lovell Fuller	464fb1726d	Keep output dimensions within WebP 14-bit range	2015-01-16 22:28:24 +00:00
Lovell Fuller	065ce6454b	Explicit cast of size_t to 32 bit integer Ensures compilation with nan 1.5.0+	2015-01-15 15:16:01 +00:00
Lovell Fuller	850c2ecdd6	Version bumps	2014-12-15 14:02:30 +00:00
Lovell Fuller	926c5603aa	Improve documentation on concurrency/parallelism	2014-12-15 14:00:23 +00:00
Lovell Fuller	d3225fa193	Add 'size' attribute to callback's info Object #138	2014-12-15 13:54:19 +00:00
Lovell Fuller	f026a835fd	Move unref of input Buffer to C++ #138	2014-12-14 10:31:25 +00:00
Lovell Fuller	47241db789	Let V8 garbage collect the Buffer earlier #138	2014-12-13 08:48:24 +00:00
Lovell Fuller	34a9970bd9	Remove useless re-definition of image #139	2014-12-12 22:04:55 +00:00
Lovell Fuller	57203f841a	Copy input Buffer to avoid V8 heap compaction #138	2014-12-12 22:02:42 +00:00
Lovell Fuller	bd20bd1881	Version bumps	2014-12-11 13:32:52 +00:00
Lovell Fuller	60f1fda7ee	Change interpretation to sRGB before transformation #133	2014-12-11 13:32:36 +00:00
Lovell Fuller	ea1013f6ec	Add support for latest Amazon Linux	2014-12-08 10:52:59 +00:00
Lovell Fuller	247b607afd	Add SVG and PSD fixtures and tests	2014-12-05 21:35:18 +00:00
Lovell Fuller	a56102a209	Ensure ICC transform of withMetadata output #133	2014-12-04 11:28:09 +00:00
Lovell Fuller	940b6f505f	Add test for Promise rejection path	2014-12-04 10:48:45 +00:00
Lovell Fuller	e1b5574c4a	Handle broken, embedded ICC profile #131	2014-12-03 10:23:35 +00:00
Lovell Fuller	f4cc6a2db4	Correct location of Dockerfile	2014-11-26 10:50:47 +00:00
Lovell Fuller	0acf865654	Faster ICC profile transform via lcms #125	2014-11-25 22:52:24 +00:00
Lovell Fuller	8460e50ee0	Remove spurious keywords	2014-11-25 19:16:01 +00:00
Lovell Fuller	f57a0e3b00	Ensure embedded profile, if any, is always used Perform sRGB conversion at end of pipe only withMetadata exports profile, should not convert Convert one fixture to sRGB to help test Discovered while investigating #125	2014-11-25 18:54:49 +00:00
Lovell Fuller	02b6016390	Add link to Dockerfile for libvips Thanks @marcbachmann	2014-11-25 10:33:43 +00:00
Lovell Fuller	4e01d63195	Add hasProfile attribute to metadata response At the very least will be useful investigating #125	2014-11-24 17:24:29 +00:00
Lovell Fuller	94b47508c0	imagemagick-native now supports async and filter	2014-11-24 15:13:47 +00:00
Lovell Fuller	328cda82c5	Updates for 7.42 stable release of libvips	2014-11-24 12:19:44 +00:00
Lovell Fuller	118b17aa2f	Apply less blur before affine reduction #121	2014-11-24 11:52:48 +00:00
Lovell Fuller	b7c7fc22f3	Ensure correct Gaussian blur before affine #121 Use double sigma instead of int radius for blur	2014-11-20 13:59:39 +00:00
Lovell Fuller	177a4f574c	Minimum version of libvips now 7.40.0 #74	2014-11-17 12:08:05 +00:00
Lovell Fuller	e22d093002	Ubuntu 14 now compiles 7.40.x from source as packaged version is the outdated 7.38.x Added support for Ubuntu 15 and Mint 17.1	2014-11-12 20:30:13 +00:00
Lovell Fuller	e7f6d49bc1	Additional blur radii tests #108	2014-11-12 20:11:28 +00:00
Lovell Fuller	b886db4b0d	Add bounds checks on blur/sharpen parameters #108	2014-11-12 20:06:28 +00:00
Lovell Fuller	ee513ac7a7	Less C, more C++ e.g. namespace, enum class Improve image reference handling	2014-11-11 18:28:23 +00:00
Lovell Fuller	e465306d97	Disable libvips cache for unit tests Aids memory leak detection	2014-11-11 18:09:48 +00:00
Lovell Fuller	32d9bc204a	Add 'fast' blur and Gaussian blur feature #108	2014-11-10 22:38:13 +00:00
Lovell Fuller	df5cf402e3	Ensure leak check tests child processes	2014-11-10 22:35:22 +00:00
Lovell Fuller	86681100b7	Control level of sharpening via radius/flat/jagged #108	2014-11-10 16:20:04 +00:00
Lovell Fuller	47927ef47d	Shrink less, affine more, maintain performance #75 Affects interpolators with 4x4+ window size e.g. Bicubic, LBB, Nohalo Introduces blur before large affine to improve large PNG reductions	2014-11-08 12:08:27 +00:00
Lovell Fuller	7537adf399	Add features from libvips 7.40+ Load TIFF from Buffer/Stream Interlaced PNG output no longer needs tilecache Option to disable PNG adaptive row filtering	2014-11-08 12:08:27 +00:00
Lovell Fuller	740838b47c	Prevent auto-rotate fail for libmagick formats #117	2014-11-08 12:07:47 +00:00
Lovell Fuller	f7c2a839ad	Add support for profile-less CMYK images #99	2014-11-06 11:30:19 +00:00
Lovell Fuller	62fcfb3dba	Add link to gulp-responsive module	2014-11-04 11:23:40 +00:00
Lovell Fuller	333e8789f4	Include cmath, erroneously removed in `3a9a137f`	2014-10-29 13:32:19 +00:00
Lovell Fuller	3a9a137f40	Modify C++ 11 to be MS-friendly #19	2014-10-29 13:16:16 +00:00