Minimum version of libvips now 7.40.0 #74

as packaged version is the outdated 7.38.x

Added support for Ubuntu 15 and Mint 17.1

.gitignore

@@ -1,15 +1,9 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
-logs
-results
 build
 node_modules
-tests/fixtures/output.*
+coverage
+test/bench/node_modules
+test/fixtures/output.*
+test/leak/libvips.supp
+
+# Mac OS X
+.DS_Store

.jshintignore

@@ -0,0 +1,3 @@
+node_modules
+test/bench/node_modules
+coverage

.jshintrc

@@ -0,0 +1,8 @@
+{
+  "strict": true,
+  "node": true,
+  "globals": {
+    "describe": true,
+    "it": true
+  }
+}

.npmignore

@@ -1,18 +1,8 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
-logs
-results
 build
 node_modules
-
+coverage
+.jshintignore
+.jshintrc
 .gitignore
-tests
+test
 .travis.yml

.travis.yml

@@ -3,15 +3,6 @@ node_js:
   - "0.10"
   - "0.11"
 before_install:
-  - sudo add-apt-repository ppa:lyrasis/precise-backports -y
+  - curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash -
-  - sudo apt-get update -qq
+after_success:
-  - sudo apt-get install -qq automake gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-turbo8-dev libpng12-dev libwebp-dev libtiff4-dev libexif-dev libxml2-dev swig graphicsmagick libmagick++-dev
+  - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
-  - git clone https://github.com/jcupitt/libvips.git
-  - cd libvips
-  - git checkout 7.38
-  - ./bootstrap.sh
-  - ./configure --enable-debug=no --enable-cxx=yes --without-orc --without-python --without-fftw
-  - make
-  - sudo make install
-  - sudo ldconfig
-  - cd $TRAVIS_BUILD_DIR

README.md

@@ -5,6 +5,7 @@
 * [API](https://github.com/lovell/sharp#api)
 * [Testing](https://github.com/lovell/sharp#testing)
 * [Performance](https://github.com/lovell/sharp#performance)
+* [Thanks](https://github.com/lovell/sharp#thanks)
 * [Licence](https://github.com/lovell/sharp#licence)
 
 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.
@@ -28,11 +29,34 @@ 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)
 
-_libvips_ can take advantage of [liborc](http://code.entropywave.com/orc/) if present. Warning: versions of _liborc_ prior to 0.4.19 suffer [memory leaks](https://github.com/lovell/sharp/issues/21#issuecomment-42367306) and version 0.4.19 suffers [buffer overflows](https://github.com/lovell/sharp/issues/21#issuecomment-44813498).
+To install the most suitable version of libvips on the following Operating Systems:
 
-### Install libvips on Mac OS
+* Mac OS
+  * Homebrew
+  * MacPorts
+* Debian Linux
+  * Debian 7, 8
+  * Ubuntu 12.04, 14.04, 14.10, 15.04
+  * Mint 13, 17
+* Red Hat Linux
+  * RHEL/Centos/Scientific 6, 7
+  * Fedora 21, 22
+
+run the following as a user with `sudo` access:
+
+	curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash -
+
+or run the following as `root`:
+
+	curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | bash -
+
+The [preinstall.sh](https://github.com/lovell/sharp/blob/master/preinstall.sh) script requires `curl` and `pkg-config`.
+
+### Mac OS tips
+
+Manual install via homebrew:
 
 	brew install homebrew/science/vips --with-webp --with-graphicsmagick
 
@@ -44,40 +68,14 @@ The _gettext_ dependency of _libvips_ [can lead](https://github.com/lovell/sharp
 
 	brew link gettext --force
 
-### Install libvips on Ubuntu Linux
-
-#### Ubuntu 14.x
-
-	sudo apt-get install libvips-dev
-
-#### Ubuntu 13.x
-
-Compiling from source is recommended:
-
-	sudo apt-get install automake build-essential git gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-turbo8-dev libpng12-dev libwebp-dev libtiff5-dev libexif-dev libxml2-dev swig
-	git clone https://github.com/jcupitt/libvips.git
-	cd libvips
-	git checkout 7.38
-	./bootstrap.sh
-	./configure --enable-debug=no --enable-cxx=yes --without-python --without-orc --without-fftw
-	make
-	sudo make install
-	sudo ldconfig
-
-#### Ubuntu 12.x
-
-Requires `libtiff4-dev` instead of `libtiff5-dev` and has [a bug](https://bugs.launchpad.net/ubuntu/+source/libwebp/+bug/1108731) in the libwebp package. Work around these problems by running these commands first:
-
-	sudo add-apt-repository ppa:lyrasis/precise-backports
-	sudo apt-get update
-	sudo apt-get install libtiff4-dev
-
-Then follow Ubuntu 13.x instructions.
-
 ### Install libvips on 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
+
+[Eugeny Vlasenko](https://github.com/mahnunchik) maintains [gulp-responsive](https://www.npmjs.org/package/gulp-responsive) and [Mohammad Prabowo](https://github.com/rizalp) maintains [gulp-sharp](https://www.npmjs.org/package/gulp-sharp).
+
 ## Usage examples
 
 ```javascript
@@ -129,13 +127,17 @@ readableStream.pipe(pipeline);
 sharp('input.png')
   .rotate(180)
   .resize(300)
+  .flatten()
+  .background('#ff6600')
   .sharpen()
+  .withMetadata()
   .quality(90)
   .webp()
   .toBuffer()
   .then(function(outputBuffer) {
-    // outputBuffer contains 300px wide, upside down, sharpened,
+    // outputBuffer contains upside down, 300px wide, alpha channel flattened
-    // 90% quality WebP image data
+    // onto orange background, sharpened, with metadata, 90% quality WebP image
+    // data
   });
 ```
 
@@ -148,11 +150,28 @@ http.createServer(function(request, response) {
 // resized to 200 pixels wide, in WebP format
 ```
 
+```javascript
+sharp(input)
+  .extract(top, left, width, height)
+  .toFile(output);
+  // Extract a region of the input image, saving in the same format.
+```
+
+```javascript
+sharp(input)
+  .extract(topOffsetPre, leftOffsetPre, widthPre, heightPre)
+  .resize(width, height)
+  .extract(topOffsetPost, leftOffsetPost, widthPost, heightPost)
+  .toFile(output);
+  // Extract a region, resize, then extract from the resized image
+```
+
 ```javascript
 sharp(inputBuffer)
   .resize(200, 300)
   .interpolateWith(sharp.interpolator.nohalo)
-  .embedWhite()
+  .background('white')
+  .embed()
   .toFile('output.tiff')
   .then(function() {
     // output.tiff is a 200 pixels wide and 300 pixels high image
@@ -162,17 +181,26 @@ sharp(inputBuffer)
 ```
 
 ```javascript
-sharp('input.gif').resize(200, 300).embedBlack().webp().toBuffer(function(err, outputBuffer) {
+sharp('input.gif')
+  .resize(200, 300)
+  .background({r: 0, g: 0, b: 0, a: 0})
+  .embed()
+  .webp()
+  .toBuffer(function(err, outputBuffer) {
     if (err) {
       throw err;
     }
     // outputBuffer contains WebP image data of a 200 pixels wide and 300 pixels high
-  // containing a scaled version, embedded on a black canvas, of input.gif
+    // containing a scaled version, embedded on a transparent canvas, of input.gif
   });
 ```
 
 ```javascript
-sharp(inputBuffer).resize(200, 200).max().jpeg().toBuffer().then(function(outputBuffer) {
+sharp(inputBuffer)
+  .resize(200, 200)
+  .max()
+  .jpeg()
+  .toBuffer().then(function(outputBuffer) {
     // outputBuffer contains JPEG image data no wider than 200 pixels and no higher
     // than 200 pixels regardless of the inputBuffer image dimensions
   });
@@ -186,12 +214,12 @@ sharp(inputBuffer).resize(200, 200).max().jpeg().toBuffer().then(function(output
 
 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.
 
@@ -204,8 +232,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
+* `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
 * `orientation`: Number value of the EXIF Orientation header, if present
 
 A Promises/A+ promise is returned when `callback` is not provided.
@@ -224,6 +253,16 @@ Scale output to `width` x `height`. By default, the resized image is cropped to
 
 `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.
 
+#### extract(top, left, width, height)
+
+Extract a region of the image. Can be used with or without a `resize` operation.
+
+`top` and `left` are the offset, in pixels, from the top-left corner.
+
+`width` and `height` are the dimensions of the extracted image.
+
+Use `extract` before `resize` for pre-resize extraction. Use `extract` after `resize` for post-resize extraction. Use `extract` before and after for both.
+
 #### crop([gravity])
 
 Crop the resized image to the exact size specified, the default behaviour.
@@ -234,17 +273,29 @@ Possible values are `north`, `east`, `south`, `west`, `center` and `centre`. The
 
 #### max()
 
-Preserving aspect ratio, resize the image to the maximum width or height specified.
+Preserving aspect ratio, resize the image to the maximum `width` or `height` specified.
 
 Both `width` and `height` must be provided via `resize` otherwise the behaviour will default to `crop`.
 
-#### embedWhite()
+#### background(rgba)
 
-Embed the resized image on a white background of the exact size specified.
+Set the background for the `embed` and `flatten` operations.
 
-#### embedBlack()
+`rgba` is parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
 
-Embed the resized image on a black background of the exact size specified.
+The alpha value is a float between `0` (transparent) and `1` (opaque).
+
+The default background is `{r: 0, g: 0, b: 0, a: 1}`, black without transparency.
+
+#### embed()
+
+Preserving aspect ratio, resize the image to the maximum `width` or `height` specified then embed on a background of the exact `width` and `height` specified.
+
+If the background contains an alpha value then WebP and PNG format output images will contain an alpha channel, even when the input image does not.
+
+#### flatten()
+
+Merge alpha transparency channel, if any, with `background`.
 
 #### rotate([angle])
 
@@ -252,7 +303,15 @@ Rotate the output image by either an explicit angle or auto-orient based on the
 
 `angle`, if present, is a Number with a value of `0`, `90`, `180` or `270`.
 
-Use this method without `angle` to determine the angle from EXIF data. Mirroring is currently unsupported.
+Use this method without `angle` to determine the angle from EXIF data. Mirroring is supported and may infer the use of a `flip` operation.
+
+#### flip()
+
+Flip the image about the vertical Y axis. This always occurs after rotation, if any.
+
+#### flop()
+
+Flop the image about the horizontal X axis. This always occurs after rotation, if any.
 
 #### withoutEnlargement()
 
@@ -260,9 +319,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([radius])
 
-Perform a mild sharpen of the resultant image. This typically reduces performance by 30%.
+When used without parameters, performs a fast, mild blur of the output image. This typically reduces performance by 10%.
+
+When a `radius` is provided, performs a slower, more accurate Gaussian blur. This typically reduces performance by 30%.
+
+* `radius`, if present, is an integral Number representing the approximate blur mask 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)
 
@@ -270,30 +343,33 @@ Use the given interpolator for image resizing, where `interpolator` is an attrib
 
 Possible interpolators, in order of performance, are:
 
-* `bilinear`: Use [bilinear interpolation](http://en.wikipedia.org/wiki/Bilinear_interpolation), the default (and fastest) interpolation.
+* `nearest`: Use [nearest neighbour interpolation](http://en.wikipedia.org/wiki/Nearest-neighbor_interpolation), suitable for image enlargement only.
+* `bilinear`: Use [bilinear interpolation](http://en.wikipedia.org/wiki/Bilinear_interpolation), the default and fastest image reduction interpolation.
 * `bicubic`: Use [bicubic interpolation](http://en.wikipedia.org/wiki/Bicubic_interpolation), which typically reduces performance by 5%.
-* `vertexSplitQuadraticBasisSpline`: Use [VSQBS interpolation](https://github.com/jcupitt/libvips/blob/master/libvips/resample/vsqbs.cpp#L48), which prevents "staircasing" when enlarging and typically reduces performance by 5%.
+* `vertexSplitQuadraticBasisSpline`: Use [VSQBS interpolation](https://github.com/jcupitt/libvips/blob/master/libvips/resample/vsqbs.cpp#L48), which prevents "staircasing" and typically reduces performance by 5%.
 * `locallyBoundedBicubic`: Use [LBB interpolation](https://github.com/jcupitt/libvips/blob/master/libvips/resample/lbb.cpp#L100), which prevents some "[acutance](http://en.wikipedia.org/wiki/Acutance)" and typically reduces performance by a factor of 2.
 * `nohalo`: Use [Nohalo interpolation](http://eprints.soton.ac.uk/268086/), which prevents acutance and typically reduces performance by a factor of 3.
 
+#### gamma([gamma])
+
+Apply a gamma correction by reducing the encoding (darken) pre-resize at a factor of `1/gamma` then increasing the encoding (brighten) post-resize at a factor of `gamma`.
+
+`gamma`, if present, is a Number betweem 1 and 3. The default value is `2.2`, a suitable approximation for sRGB images.
+
+This can improve the perceived brightness of a resized image in non-linear colour spaces.
+
+JPEG input images will not take advantage of the shrink-on-load performance optimisation when applying a gamma correction.
+
+#### grayscale() / greyscale()
+
+Convert to 8-bit greyscale; 256 shades of grey.
+
+This is a linear operation. If the input image is in a non-linear colour space such as sRGB, use `gamma()` with `greyscale()` for the best results.
+
+The output image will still be web-friendly sRGB and contain three (identical) channels.
+
 ### Output options
 
-#### progressive()
-
-Use progressive (interlace) scan for JPEG and PNG output. This typically reduces compression performance by 30% but results in an image that can be rendered sooner when decompressed.
-
-#### quality(quality)
-
-The output quality to use for lossy JPEG, WebP and TIFF output formats. The default quality is `80`.
-
-`quality` is a Number between 1 and 100.
-
-#### compressionLevel(compressionLevel)
-
-An advanced setting for the _zlib_ compression level of the lossless PNG output format. The default level is `6`.
-
-`compressionLevel` is a Number between -1 and 9.
-
 #### jpeg()
 
 Use JPEG format for the output image.
@@ -306,6 +382,32 @@ Use PNG format for the output image.
 
 Use WebP format for the output image.
 
+#### quality(quality)
+
+The output quality to use for lossy JPEG, WebP and TIFF output formats. The default quality is `80`.
+
+`quality` is a Number between 1 and 100.
+
+#### progressive()
+
+Use progressive (interlace) scan for JPEG and PNG output. This typically reduces compression performance by 30% but results in an image that can be rendered sooner when decompressed.
+
+#### withMetadata()
+
+Include all metadata (ICC, EXIF, XMP) from the input image in the output image. The default behaviour is to strip all metadata.
+
+#### compressionLevel(compressionLevel)
+
+An advanced setting for the _zlib_ compression level of the lossless PNG output format. The default level is `6`.
+
+`compressionLevel` is a Number between 0 and 9.
+
+#### withoutAdaptiveFiltering()
+
+_Requires libvips 7.41.0+_
+
+An advanced and experimental PNG output setting to disable adaptive row filtering.
+
 ### Output methods
 
 #### toFile(filename, [callback])
@@ -314,8 +416,8 @@ Use WebP format for the output image.
 
 `callback`, if present, is called with two arguments `(err, info)` where:
 
-* `err` contains an error message, if any
+* `err` contains an error message, if any.
-* `info` contains the final resized image dimensions in its `width` and `height` properties
+* `info` contains the output image `format`, `width` and `height`.
 
 A Promises/A+ promise is returned when `callback` is not provided.
 
@@ -325,9 +427,9 @@ Write image data to a Buffer, the format of which will match the input image by
 
 `callback`, if present, gets three arguments `(err, buffer, info)` where:
 
-* `err` is an error message, if any
+* `err` is an error message, if any.
-* `buffer` is the resultant image data
+* `buffer` is the output image data.
-* `info` contains the final resized image dimensions in its `width` and `height` properties
+* `info` contains the output image `format`, `width` and `height`.
 
 A Promises/A+ promise is returned when `callback` is not provided.
 
@@ -348,6 +450,18 @@ sharp.cache(200); // { current: 75, high: 99, memory: 200, items: 500 }
 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.
+
+This method always returns the current concurrency.
+
+```javascript
+var threads = sharp.concurrency(); // 4
+sharp.concurrency(2); // 2
+sharp.concurrency(0); // 4
+```
+
 #### sharp.counters()
 
 Provides access to internal task counters.
@@ -361,31 +475,83 @@ var counters = sharp.counters(); // { queue: 2, process: 4 }
 
 ## Testing
 
-[![Build Status](https://travis-ci.org/lovell/sharp.png?branch=master)](https://travis-ci.org/lovell/sharp)
+### Functional tests
 
+#### Coverage
+
+[![Test Coverage](https://coveralls.io/repos/lovell/sharp/badge.png?branch=master)](https://coveralls.io/r/lovell/sharp?branch=master)
+
+#### Ubuntu 12.04
+
+[![Ubuntu 12.04 Build Status](https://travis-ci.org/lovell/sharp.png?branch=master)](https://travis-ci.org/lovell/sharp)
+
+#### Centos 6.5
+
+[![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
+```
 
-Running the tests requires both ImageMagick and GraphicsMagick plus one of either libmagick++-dev or libgraphicsmagick++.
+### Memory leak tests
 
+```
+cd sharp/test/leak
+./leak.sh
+```
+
+Requires _valgrind_:
+
+```
+brew install valgrind
+```
+
+```
+sudo apt-get install -qq valgrind
+```
+
+### Benchmark tests
+
+```
+cd sharp/test/bench
+npm install
+npm test
+```
+
+Requires both _ImageMagick_ and _GraphicsMagick_:
+
+```
 brew install imagemagick
 brew install graphicsmagick
+```
 
-	sudo apt-get install imagemagick graphicsmagick libmagick++-dev
+```
+sudo apt-get install -qq imagemagick graphicsmagick libmagick++-dev
+```
+
+```
+sudo yum install ImageMagick
+sudo yum install -y http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
+sudo yum install -y --enablerepo=epel GraphicsMagick
+```
 
 ## Performance
 
 ### Test environment
 
-* Intel Xeon [L5520](http://ark.intel.com/products/40201/Intel-Xeon-Processor-L5520-8M-Cache-2_26-GHz-5_86-GTs-Intel-QPI) 2.27GHz 8MB cache
+* AWS EC2 [c3.xlarge](http://aws.amazon.com/ec2/instance-types/#Compute_Optimized)
-* Ubuntu 13.10
+* Ubuntu 14.04
-* libvips 7.38.5
+* libvips 7.40.8
+* liborc 0.4.22
 
 ### The contenders
 
-* [imagemagick-native](https://github.com/mash/node-imagemagick-native) - 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 and blocks main V8 thread whilst processing.
-* [imagemagick](https://github.com/rsms/node-imagemagick) - Supports filesystem only and "has been unmaintained for a long time".
+* [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) - Fully featured wrapper around GraphicsMagick.
+* [gm](https://github.com/aheckmann/gm) v1.16.0 - Fully featured wrapper around GraphicsMagick.
-* sharp - Caching within libvips disabled to ensure a fair comparison.
+* sharp v0.6.2 - Caching within libvips disabled to ensure a fair comparison.
 
 ### The task
 
@@ -395,25 +561,44 @@ Decompress a 2725x2225 JPEG image, resize and crop to 720x480, then compress to
 
 | Module                | Input  | Output | Ops/sec | Speed-up |
 | :-------------------- | :----- | :----- | ------: | -------: |
-| imagemagick-native    | buffer | buffer |    0.97 |        1 |
+| imagemagick-native    | buffer | buffer |    1.58 |        1 |
-| imagemagick           | file   | file   |    2.49 |      2.6 |
+| imagemagick           | file   | file   |    6.23 |      3.9 |
-| gm                    | buffer | file   |    3.72 |      3.8 |
+| gm                    | buffer | file   |    5.32 |      3.4 |
-| gm                    | buffer | buffer |    3.80 |      3.9 |
+| gm                    | buffer | buffer |    5.32 |      3.4 |
-| gm                    | file   | file   |    3.67 |      3.8 |
+| gm                    | file   | file   |    5.36 |      3.4 |
-| gm                    | file   | buffer |    3.67 |      3.8 |
+| gm                    | file   | buffer |    5.36 |      3.4 |
-| sharp                 | buffer | file   |   13.62 |     14.0 |
+| sharp                 | buffer | file   |   22.05 |     14.0 |
-| sharp                 | buffer | buffer |   12.43 |     12.8 |
+| sharp                 | buffer | buffer |   22.14 |     14.0 |
-| sharp                 | file   | file   |   13.02 |     13.4 |
+| sharp                 | file   | file   |   21.79 |     13.8 |
-| sharp                 | file   | buffer |   11.15 |     11.5 |
+| sharp                 | file   | buffer |   21.90 |     13.9 |
-| sharp +sharpen        | file   | buffer |   10.26 |     10.6 |
+| sharp                 | stream | stream |   20.87 |     13.2 |
-| sharp +progressive    | file   | buffer |    9.44 |      9.7 |
+| sharp +promise        | file   | buffer |   21.89 |     13.9 |
-| sharp +sequentialRead | file   | buffer |   11.94 |     12.3 |
+| sharp +sharpen        | file   | buffer |   19.69 |     12.5 |
+| sharp +progressive    | file   | buffer |   16.93 |     10.7 |
+| sharp +sequentialRead | file   | buffer |   21.60 |     13.7 |
 
-You can expect much greater performance with caching enabled (default) and using 16+ core machines.
+You can expect greater performance with caching enabled (default) and using 8+ core machines.
+
+## Thanks
+
+This module would never have been possible without the help and code contributions of the following people:
+
+* [John Cupitt](https://github.com/jcupitt)
+* [Pierre Inglebert](https://github.com/pierreinglebert)
+* [Jonathan Ong](https://github.com/jonathanong)
+* [Chanon Sajjamanochai](https://github.com/chanon)
+* [Juliano Julio](https://github.com/julianojulio)
+* [Daniel Gasienica](https://github.com/gasi)
+* [Julian Walker](https://github.com/julianwa)
+* [Amit Pitaru](https://github.com/apitaru)
+* [Brandon Aaron](https://github.com/brandonaaron)
+* [Andreas Lind](https://github.com/papandreou)
+
+Thank you!
 
 ## Licence
 
-Copyright 2013, 2014 Lovell Fuller, Pierre Inglebert, Jonathan Ong and Chanon Sajjamanochai
+Copyright 2013, 2014 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.

binding.gyp

@@ -1,7 +1,13 @@
 {
   'targets': [{
     'target_name': 'sharp',
-    'sources': ['src/sharp.cc'],
+    'sources': [
+      'src/common.cc',
+      'src/utilities.cc',
+      'src/metadata.cc',
+      'src/resize.cc',
+      'src/sharp.cc'
+    ],
     'variables': {
       'PKG_CONFIG_PATH': '<!(which brew >/dev/null 2>&1 && eval $(brew --env) && echo $PKG_CONFIG_LIBDIR || true):$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig'
     },
@@ -12,11 +18,20 @@
       '<!(PKG_CONFIG_PATH="<(PKG_CONFIG_PATH)" pkg-config --cflags vips glib-2.0)',
       '<!(node -e "require(\'nan\')")'
     ],
-    'cflags': ['-fexceptions', '-Wall', '-O3'],
+    'cflags_cc': [
-    'cflags_cc': ['-std=c++0x', '-fexceptions', '-Wall', '-O3'],
+      '-std=c++0x',
+      '-fexceptions',
+      '-Wall',
+      '-O3'
+    ],
     'xcode_settings': {
-      'OTHER_CFLAGS': ['-std=c++11', '-stdlib=libc++', '-fexceptions', '-Wall', '-O3'],
+      'OTHER_CPLUSPLUSFLAGS': [
-      'OTHER_CPLUSPLUSFLAGS': ['-std=c++11', '-stdlib=libc++', '-fexceptions', '-Wall', '-O3'],
+        '-std=c++11',
+        '-stdlib=libc++',
+        '-fexceptions',
+        '-Wall',
+        '-O3'
+      ],
       'MACOSX_DEPLOYMENT_TARGET': '10.7'
     }
   }]

index.js

@@ -1,10 +1,15 @@
-/*jslint node: true */
 'use strict';
 
+var path = require('path');
 var util = require('util');
 var stream = require('stream');
-var Promise = require('bluebird');
+
+var semver = require('semver');
+var color = require('color');
+var BluebirdPromise = require('bluebird');
+
 var sharp = require('./build/Release/sharp');
+var libvipsVersion = sharp.libvipsVersion();
 
 var Sharp = function(input) {
   if (!(this instanceof Sharp)) {
@@ -12,31 +17,67 @@ var Sharp = function(input) {
   }
   stream.Duplex.call(this);
   this.options = {
+    // input options
+    streamIn: false,
+    sequentialRead: false,
+    // ICC profile to use when input CMYK image has no embedded profile
+    iccProfileCmyk: path.join(__dirname, 'icc', 'USWebCoatedSWOP.icc'),
+    // resize options
+    topOffsetPre: -1,
+    leftOffsetPre: -1,
+    widthPre: -1,
+    heightPre: -1,
+    topOffsetPost: -1,
+    leftOffsetPost: -1,
+    widthPost: -1,
+    heightPost: -1,
     width: -1,
     height: -1,
     canvas: 'c',
     gravity: 0,
     angle: 0,
+    flip: false,
+    flop: false,
     withoutEnlargement: false,
-    sharpen: false,
     interpolator: 'bilinear',
+    // operations
+    background: [0, 0, 0, 255],
+    flatten: false,
+    blurRadius: 0,
+    sharpenRadius: 0,
+    sharpenFlat: 1,
+    sharpenJagged: 2,
+    gamma: 0,
+    greyscale: false,
+    // output options
+    output: '__input',
     progressive: false,
-    sequentialRead: false,
     quality: 80,
     compressionLevel: 6,
-    streamIn: false,
+    withoutAdaptiveFiltering: false,
     streamOut: false,
-    output: '__input'
+    withMetadata: false
   };
   if (typeof input === 'string') {
     // input=file
     this.options.fileIn = input;
   } else if (typeof input === 'object' && input instanceof Buffer) {
     // input=buffer
-    if (input.length > 0) {
+    if (
+      (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 is empty');
+      throw new Error('Buffer contains an unsupported image format. JPEG, PNG, WebP and TIFF are currently supported.');
     }
   } else {
     // input=stream
@@ -51,8 +92,9 @@ util.inherits(Sharp, stream.Duplex);
   Handle incoming chunk on Writable Stream
 */
 Sharp.prototype._write = function(chunk, encoding, callback) {
+  /*jslint unused: false */
   if (this.options.streamIn) {
-    if (typeof chunk === 'object' || chunk instanceof Buffer) {
+    if (typeof chunk === 'object' && chunk instanceof Buffer) {
       if (typeof this.options.bufferIn === 'undefined') {
         // Create new Buffer
         this.options.bufferIn = new Buffer(chunk.length);
@@ -78,24 +120,38 @@ module.exports.gravity = {'center': 0, 'centre': 0, 'north': 1, 'east': 2, 'sout
 
 Sharp.prototype.crop = function(gravity) {
   this.options.canvas = 'c';
-  if (typeof gravity !== 'undefined') {
+  if (typeof gravity === 'number' && !Number.isNaN(gravity) && gravity >= 0 && gravity <= 4) {
-    // Is this a supported gravity?
-    if (!Number.isNaN(gravity) && gravity >= 0 && gravity <= 4) {
     this.options.gravity = gravity;
   } else {
     throw new Error('Unsupported crop gravity ' + gravity);
   }
-  }
   return this;
 };
 
-Sharp.prototype.embedWhite = function() {
+Sharp.prototype.extract = function(topOffset, leftOffset, width, height) {
-  this.options.canvas = 'w';
+  /*jslint unused: false */
+  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];
+  }.bind(this));
   return this;
 };
 
-Sharp.prototype.embedBlack = function() {
+/*
-  this.options.canvas = 'b';
+  Set the background colour for embed and flatten operations.
+  Delegates to the 'Color' module, which can throw an Error
+  but is liberal in what it accepts, clamping values to sensible min/max.
+*/
+Sharp.prototype.background = function(rgba) {
+  var colour = color(rgba);
+  this.options.background = colour.rgbArray();
+  this.options.background.push(colour.alpha() * 255);
+  return this;
+};
+
+Sharp.prototype.embed = function() {
+  this.options.canvas = 'e';
   return this;
 };
 
@@ -104,6 +160,11 @@ Sharp.prototype.max = function() {
   return this;
 };
 
+Sharp.prototype.flatten = function(flatten) {
+  this.options.flatten = (typeof flatten === 'boolean') ? flatten : true;
+  return this;
+};
+
 /*
   Rotate output image by 0, 90, 180 or 270 degrees
   Auto-rotation based on the EXIF Orientation tag is represented by an angle of -1
@@ -119,6 +180,22 @@ Sharp.prototype.rotate = function(angle) {
   return this;
 };
 
+/*
+  Flip the image vertically, about the Y axis
+*/
+Sharp.prototype.flip = function(flip) {
+  this.options.flip = (typeof flip === 'boolean') ? flip : true;
+  return this;
+};
+
+/*
+  Flop the image horizontally, about the X axis
+*/
+Sharp.prototype.flop = function(flop) {
+  this.options.flop = (typeof flop === 'boolean') ? flop : true;
+  return this;
+};
+
 /*
   Do not enlarge the output if the input width *or* height are already less than the required dimensions
   This is equivalent to GraphicsMagick's ">" geometry option:
@@ -129,8 +206,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 radius to use a fast, mild blur.
+  Call with a radius to use a slower, more accurate Gaussian blur.
+*/
+Sharp.prototype.blur = function(radius) {
+  if (typeof radius === 'undefined') {
+    // No arguments: default to mild blur
+    this.options.blurRadius = -1;
+  } else if (typeof radius === 'boolean') {
+    // Boolean argument: apply mild blur?
+    this.options.blurRadius = radius ? -1 : 0;
+  } else if (typeof radius === 'number' && !Number.isNaN(radius) && (radius % 1 === 0) && radius >= 1) {
+    // Numeric argument: specific radius
+    this.options.blurRadius = radius;
+  } else {
+    throw new Error('Invalid blur radius ' + radius + ' (expected integer >= 1)');
+  }
+  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;
 };
 
@@ -138,6 +271,7 @@ Sharp.prototype.sharpen = function(sharpen) {
   Set the interpolator to use for the affine transformation
 */
 module.exports.interpolator = {
+  nearest: 'nearest',
   bilinear: 'bilinear',
   bicubic: 'bicubic',
   nohalo: 'nohalo',
@@ -150,17 +284,29 @@ Sharp.prototype.interpolateWith = function(interpolator) {
 };
 
 /*
-  Deprecated interpolation methods, to be removed in v0.7.0
+  Darken image pre-resize (1/gamma) and brighten post-resize (gamma).
+  Improves brightness of resized image in non-linear colour spaces.
 */
-Sharp.prototype.bilinearInterpolation = util.deprecate(function() {
+Sharp.prototype.gamma = function(gamma) {
-  return this.interpolateWith(module.exports.interpolator.bilinear);
+  if (typeof gamma === 'undefined') {
-}, 'bilinearInterpolation() is deprecated, use interpolateWith(sharp.interpolator.bilinear) instead');
+    // Default gamma correction of 2.2 (sRGB)
-Sharp.prototype.bicubicInterpolation = util.deprecate(function() {
+    this.options.gamma = 2.2;
-  return this.interpolateWith(module.exports.interpolator.bicubic);
+  } else if (!Number.isNaN(gamma) && gamma >= 1 && gamma <= 3) {
-}, 'bicubicInterpolation() is deprecated, use interpolateWith(sharp.interpolator.bicubic) instead');
+    this.options.gamma = gamma;
-Sharp.prototype.nohaloInterpolation = util.deprecate(function() {
+  } else {
-  return this.interpolateWith(module.exports.interpolator.nohalo);
+    throw new Error('Invalid gamma correction (1.0 to 3.0) ' + gamma);
-}, 'nohaloInterpolation() is deprecated, use interpolateWith(sharp.interpolator.nohalo) instead');
+  }
+  return this;
+};
+
+/*
+  Convert to greyscale
+*/
+Sharp.prototype.greyscale = function(greyscale) {
+  this.options.greyscale = (typeof greyscale === 'boolean') ? greyscale : true;
+  return this;
+};
+Sharp.prototype.grayscale = Sharp.prototype.greyscale;
 
 Sharp.prototype.progressive = function(progressive) {
   this.options.progressive = (typeof progressive === 'boolean') ? progressive : true;
@@ -181,20 +327,40 @@ Sharp.prototype.quality = function(quality) {
   return this;
 };
 
+/*
+  zlib compression level for PNG output
+*/
 Sharp.prototype.compressionLevel = function(compressionLevel) {
-  if (!Number.isNaN(compressionLevel) && compressionLevel >= -1 && compressionLevel <= 9) {
+  if (!Number.isNaN(compressionLevel) && compressionLevel >= 0 && compressionLevel <= 9) {
     this.options.compressionLevel = compressionLevel;
   } else {
-    throw new Error('Invalid compressionLevel (-1 to 9) ' + compressionLevel);
+    throw new Error('Invalid compressionLevel (0 to 9) ' + compressionLevel);
   }
   return this;
 };
 
+/*
+  Disable the use of adaptive row filtering for PNG output - requires libvips 7.41.0+
+*/
+Sharp.prototype.withoutAdaptiveFiltering = function(withoutAdaptiveFiltering) {
+  if (semver.gte(libvipsVersion, '7.41.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;
+};
+
 Sharp.prototype.resize = function(width, height) {
   if (!width) {
     this.options.width = -1;
   } else {
-    if (!Number.isNaN(width)) {
+    if (typeof width === 'number' && !Number.isNaN(width)) {
       this.options.width = width;
     } else {
       throw new Error('Invalid width ' + width);
@@ -203,7 +369,7 @@ Sharp.prototype.resize = function(width, height) {
   if (!height) {
     this.options.height = -1;
   } else {
-    if (!Number.isNaN(height)) {
+    if (typeof height === 'number' && !Number.isNaN(height)) {
       this.options.height = height;
     } else {
       throw new Error('Invalid height ' + height);
@@ -221,7 +387,7 @@ Sharp.prototype.toFile = function(output, callback) {
     if (typeof callback === 'function') {
       callback(errOutputInvalid);
     } else {
-      return Promise.reject(errOutputInvalid);
+      return BluebirdPromise.reject(errOutputInvalid);
     }
   } else {
     if (this.options.fileIn === output) {
@@ -229,7 +395,7 @@ Sharp.prototype.toFile = function(output, callback) {
       if (typeof callback === 'function') {
         callback(errOutputIsInput);
       } else {
-        return Promise.reject(errOutputIsInput);
+        return BluebirdPromise.reject(errOutputIsInput);
       }
     } else {
       this.options.output = output;
@@ -245,31 +411,16 @@ Sharp.prototype.toBuffer = function(callback) {
 
 Sharp.prototype.jpeg = function() {
   this.options.output = '__jpeg';
-  if (arguments.length > 0) {
-    console.error('Use of the jpeg() method with a callback is deprecated in 0.6.x and will be removed in 0.7.x');
-    console.error('Please add toFile(), toBuffer() or Stream methods e.g. pipe() for JPEG output');
-    this._sharp(arguments);
-  }
   return this;
 };
 
 Sharp.prototype.png = function() {
   this.options.output = '__png';
-  if (arguments.length > 0) {
-    console.error('Use of the png() method with a callback is deprecated in 0.6.x and will be removed in 0.7.x');
-    console.error('Please add toFile(), toBuffer() or Stream methods e.g. pipe() for PNG output');
-    this._sharp(arguments);
-  }
   return this;
 };
 
 Sharp.prototype.webp = function() {
   this.options.output = '__webp';
-  if (arguments.length > 0) {
-    console.error('Use of the webp() method with a callback is deprecated in 0.6.x and will be removed in 0.7.x');
-    console.error('Please add toFile(), toBuffer() or Stream methods e.g. pipe() for WebP output');
-    this._sharp(arguments);
-  }
   return this;
 };
 
@@ -307,16 +458,22 @@ Sharp.prototype._sharp = function(callback) {
       // output=stream, input=stream
       this.on('finish', function() {
         sharp.resize(that.options, function(err, data) {
-          if (err) throw err;
+          if (err) {
+            that.emit('error', new Error(err));
+          } else {
             that.push(data);
+          }
           that.push(null);
         });
       });
     } else {
       // output=stream, input=file/buffer
       sharp.resize(this.options, function(err, data) {
-        if (err) throw err;
+        if (err) {
+          that.emit('error', new Error(err));
+        } else {
           that.push(data);
+        }
         that.push(null);
       });
     }
@@ -325,7 +482,7 @@ Sharp.prototype._sharp = function(callback) {
     // output=promise
     if (this.options.streamIn) {
       // output=promise, input=stream
-      return new Promise(function(resolve, reject) {
+      return new BluebirdPromise(function(resolve, reject) {
         that.on('finish', function() {
           sharp.resize(that.options, function(err, data) {
             if (err) {
@@ -338,7 +495,7 @@ Sharp.prototype._sharp = function(callback) {
       });
     } else {
       // output=promise, input=file/buffer
-      return new Promise(function(resolve, reject) {
+      return new BluebirdPromise(function(resolve, reject) {
         sharp.resize(that.options, function(err, data) {
           if (err) {
             reject(err);
@@ -368,7 +525,7 @@ Sharp.prototype.metadata = function(callback) {
     return this;
   } else {
     if (this.options.streamIn) {
-      return new Promise(function(resolve, reject) {
+      return new BluebirdPromise(function(resolve, reject) {
         that.on('finish', function() {
           sharp.metadata(that.options, function(err, data) {
             if (err) {
@@ -380,7 +537,7 @@ Sharp.prototype.metadata = function(callback) {
         });
       });
     } else {
-      return new Promise(function(resolve, reject) {
+      return new BluebirdPromise(function(resolve, reject) {
         sharp.metadata(that.options, function(err, data) {
           if (err) {
             reject(err);
@@ -397,18 +554,35 @@ Sharp.prototype.metadata = function(callback) {
   Get and set cache memory and item limits
 */
 module.exports.cache = function(memory, items) {
-  if (Number.isNaN(memory)) {
+  if (typeof memory !== 'number' || Number.isNaN(memory)) {
     memory = null;
   }
-  if (Number.isNaN(items)) {
+  if (typeof items !== 'number' || Number.isNaN(items)) {
     items = null;
   }
   return sharp.cache(memory, items);
 };
 
+/*
+  Get and set size of thread pool
+*/
+module.exports.concurrency = function(concurrency) {
+  if (typeof concurrency !== 'number' || Number.isNaN(concurrency)) {
+    concurrency = null;
+  }
+  return sharp.concurrency(concurrency);
+};
+
 /*
   Get internal counters
 */
 module.exports.counters = function() {
   return sharp.counters();
 };
+
+/*
+  Get the version of the libvips library
+*/
+module.exports.libvipsVersion = function() {
+  return libvipsVersion;
+};

package.json

@@ -1,15 +1,21 @@
 {
   "name": "sharp",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "author": "Lovell Fuller <npm@lovell.info>",
   "contributors": [
     "Pierre Inglebert <pierre.inglebert@gmail.com>",
     "Jonathan Ong <jonathanrichardong@gmail.com>",
-    "Chanon Sajjamanochai <chanon.s@gmail.com>"
+    "Chanon Sajjamanochai <chanon.s@gmail.com>",
+    "Juliano Julio <julianojulio@gmail.com>",
+    "Daniel Gasienica <daniel@gasienica.ch>",
+    "Julian Walker <julian@fiftythree.com>",
+    "Amit Pitaru <pitaru.amit@gmail.com>",
+    "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 tests/unit && node tests/perf"
+    "test": "node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=10000 ./test/unit/*.js"
   },
   "main": "index.js",
   "repository": {
@@ -26,23 +32,23 @@
     "thumbnail",
     "sharpen",
     "crop",
+    "extract",
     "embed",
     "libvips",
     "vips",
-    "fast",
-    "buffer",
     "stream"
   ],
   "dependencies": {
-    "nan": "^1.3.0",
+    "bluebird": "^2.3.11",
-    "bluebird": "^2.3.1"
+    "color": "^0.7.1",
+    "nan": "^1.4.1",
+    "semver": "^4.1.0"
   },
   "devDependencies": {
-    "imagemagick": "^0.1.3",
+    "mocha": "^2.0.1",
-    "imagemagick-native": "^1.2.2",
+    "mocha-jshint": "^0.0.9",
-    "gm": "^1.16.0",
+    "istanbul": "^0.3.2",
-    "async": "^0.9.0",
+    "coveralls": "^2.11.2"
-    "benchmark": "^1.0.0"
   },
   "license": "Apache 2.0",
   "engines": {

preinstall.sh

@@ -0,0 +1,151 @@
+#!/bin/sh
+
+# Ensures libvips is installed and attempts to install it if not
+# Currently supports:
+# * Mac OS
+# * Debian Linux
+#   * Debian 7, 8
+#   * Ubuntu 12.04, 14.04, 14.10, 15.04
+#   * Mint 13, 17
+# * Red Hat Linux
+#   * RHEL/Centos/Scientific 6, 7
+#   * Fedora 21, 22
+
+vips_version_minimum=7.40.0
+vips_version_latest_major=7.40
+vips_version_latest_minor=11
+
+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
+  make
+  make install
+  cd ..
+  rm -rf vips-$vips_version_latest_major.$vips_version_latest_minor
+  rm vips-$vips_version_latest_major.$vips_version_latest_minor.tar.gz
+  ldconfig
+  echo "Installed libvips $vips_version_latest_major.$vips_version_latest_minor"
+}
+
+sorry() {
+  echo "Sorry, I don't yet know how to install libvips on $1"
+  exit 1
+}
+
+# Is libvips already installed, and is it at least the minimum required version?
+
+if ! type pkg-config >/dev/null; then
+  sorry "a system without pkg-config"
+fi
+
+pkg_config_path_homebrew=`which brew >/dev/null 2>&1 && eval $(brew --env) && echo $PKG_CONFIG_LIBDIR || true`
+pkg_config_path="$pkg_config_path_homebrew:$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig"
+
+PKG_CONFIG_PATH=$pkg_config_path pkg-config --exists vips
+if [ $? -eq 0 ]; then
+  vips_version_found=$(PKG_CONFIG_PATH=$pkg_config_path pkg-config --modversion vips)
+  pkg-config --atleast-version=$vips_version_minimum vips
+  if [ $? -eq 0 ]; then
+    # Found suitable version of libvips
+    echo "Found libvips $vips_version_found"
+    exit 0
+  fi
+  echo "Found libvips $vips_version_found but require $vips_version_minimum"
+else
+  echo "Could not find libvips using a PKG_CONFIG_PATH of '$pkg_config_path'"
+fi
+
+# Verify root/sudo access
+if [ "$(id -u)" -ne "0" ]; then
+  echo "Sorry, I need root/sudo access to continue"
+  exit 1
+fi
+
+# OS-specific installations of libvips follows
+
+case $(uname -s) in
+  *[Dd]arwin*)
+    # Mac OS
+    echo "Detected Mac OS"
+    if type "brew" > /dev/null; then
+      echo "Installing libvips via homebrew"
+      brew install homebrew/science/vips --with-webp --with-graphicsmagick
+    elif type "port" > /dev/null; then
+      echo "Installing libvips via MacPorts"
+      port install vips
+    else
+      sorry "Mac OS without homebrew or MacPorts"
+    fi
+    ;;
+  *)
+    if [ -f /etc/debian_version ]; then
+      # Debian Linux
+      DISTRO=$(lsb_release -c -s)
+      echo "Detected Debian Linux '$DISTRO'"
+      case "$DISTRO" in
+        jessie|vivid)
+          # Debian 8, Ubuntu 15
+          echo "Installing 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 libxml2-dev swig libmagickwand-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
+          install_libvips_from_source
+          ;;
+        *)
+          # Unsupported Debian-based OS
+          sorry "Debian-based $DISTRO"
+          ;;
+      esac
+    elif [ -f /etc/redhat-release ]; then
+      # Red Hat Linux
+      RELEASE=$(cat /etc/redhat-release)
+      echo "Detected Red Hat Linux '$RELEASE'"
+      case $RELEASE in
+        "Red Hat Enterprise Linux release 7."*|"CentOS Linux release 7."*|"Scientific Linux release 7."*)
+          # RHEL/CentOS 7
+          echo "Installing libvips dependencies via yum"
+          yum groupinstall -y "Development Tools"
+          yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel 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 http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
+          yum install -y --enablerepo=nux-dextop gobject-introspection-devel
+          yum install -y http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
+          yum install -y --enablerepo=remi libwebp-devel
+          install_libvips_from_source "--prefix=/usr"
+          ;;
+        "Fedora release 21 "*|"Fedora release 22 "*)
+          # Fedora 21, 22
+          echo "Installing libvips via yum"
+          yum install vips-devel
+          ;;
+        *)
+          # Unsupported RHEL-based OS
+          sorry "$RELEASE"
+          ;;
+      esac
+    else
+      # Unsupported OS
+      sorry "$(uname -a)"
+    fi
+    ;;
+esac

src/common.cc

@@ -0,0 +1,158 @@
+#include <string>
+#include <string.h>
+#include <vips/vips.h>
+
+#include "common.h"
+
+namespace sharp {
+
+  // How many tasks are in the queue?
+  volatile int counterQueue = 0;
+
+  // How many tasks are being processed?
+  volatile int counterProcess = 0;
+
+  // 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);
+  }
+  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");
+  }
+
+  // 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 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

src/common.h

@@ -0,0 +1,66 @@
+#ifndef SHARP_COMMON_H
+#define SHARP_COMMON_H
+
+namespace sharp {
+
+  enum class ImageType {
+    UNKNOWN,
+    JPEG,
+    PNG,
+    WEBP,
+    TIFF,
+    MAGICK
+  };
+
+  // How many tasks are in the queue?
+  extern volatile int counterQueue;
+
+  // How many tasks are being processed?
+  extern volatile int counterProcess;
+
+  // 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);
+
+  /*
+    Determine image format of a buffer.
+  */
+  ImageType DetermineImageType(void *buffer, size_t const length);
+
+  /*
+    Determine image format of a file.
+  */
+  ImageType DetermineImageType(char const *file);
+
+  /*
+    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 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
+
+#endif

src/metadata.cc

@@ -0,0 +1,145 @@
+#include <node.h>
+#include <vips/vips.h>
+
+#include "nan.h"
+
+#include "common.h"
+#include "metadata.h"
+
+using namespace v8;
+using namespace sharp;
+
+struct MetadataBaton {
+  // Input
+  std::string fileIn;
+  void* bufferIn;
+  size_t bufferInLength;
+  // Output
+  std::string format;
+  int width;
+  int height;
+  std::string space;
+  int channels;
+  bool hasAlpha;
+  int orientation;
+  std::string err;
+
+  MetadataBaton():
+    bufferInLength(0),
+    orientation(0) {}
+};
+
+class MetadataWorker : public NanAsyncWorker {
+
+ public:
+  MetadataWorker(NanCallback *callback, MetadataBaton *baton) : NanAsyncWorker(callback), baton(baton) {}
+  ~MetadataWorker() {}
+
+  void Execute() {
+    // Decrement queued task counter
+    g_atomic_int_dec_and_test(&counterQueue);
+
+    ImageType imageType = ImageType::UNKNOWN;
+    VipsImage *image = NULL;
+    if (baton->bufferInLength > 1) {
+      // From buffer
+      imageType = DetermineImageType(baton->bufferIn, baton->bufferInLength);
+      if (imageType != ImageType::UNKNOWN) {
+        image = InitImage(imageType, baton->bufferIn, baton->bufferInLength, VIPS_ACCESS_RANDOM);
+      } else {
+        (baton->err).append("Input buffer contains unsupported image format");
+      }
+    } else {
+      // From file
+      imageType = DetermineImageType(baton->fileIn.c_str());
+      if (imageType != ImageType::UNKNOWN) {
+        image = InitImage(imageType, baton->fileIn.c_str(), VIPS_ACCESS_RANDOM);
+      } else {
+        (baton->err).append("File is of an unsupported image format");
+      }
+    }
+    if (image != NULL && imageType != ImageType::UNKNOWN) {
+      // Image type
+      switch (imageType) {
+        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;
+      // 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();
+  }
+
+  void HandleOKCallback () {
+    NanScope();
+
+    Handle<Value> argv[2] = { NanNull(), NanNull() };
+    if (!baton->err.empty()) {
+      // Error
+      argv[0] = Exception::Error(NanNew<String>(baton->err.data(), baton->err.size()));
+    } else {
+      // Metadata Object
+      Local<Object> info = NanNew<Object>();
+      info->Set(NanNew<String>("format"), NanNew<String>(baton->format));
+      info->Set(NanNew<String>("width"), NanNew<Number>(baton->width));
+      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>("hasAlpha"), NanNew<Boolean>(baton->hasAlpha));
+      if (baton->orientation > 0) {
+        info->Set(NanNew<String>("orientation"), NanNew<Number>(baton->orientation));
+      }
+      argv[1] = info;
+    }
+    delete baton;
+
+    // Return to JavaScript
+    callback->Call(2, argv);
+  }
+
+ private:
+  MetadataBaton* baton;
+};
+
+/*
+  metadata(options, callback)
+*/
+NAN_METHOD(metadata) {
+  NanScope();
+
+  // V8 objects are converted to non-V8 types held in the baton struct
+  MetadataBaton *baton = new MetadataBaton;
+  Local<Object> options = args[0]->ToObject();
+
+  // Input filename
+  baton->fileIn = *String::Utf8Value(options->Get(NanNew<String>("fileIn"))->ToString());
+  // Input Buffer object
+  if (options->Get(NanNew<String>("bufferIn"))->IsObject()) {
+    Local<Object> buffer = options->Get(NanNew<String>("bufferIn"))->ToObject();
+    baton->bufferInLength = node::Buffer::Length(buffer);
+    baton->bufferIn = node::Buffer::Data(buffer);
+  }
+
+  // Join queue for worker thread
+  NanCallback *callback = new NanCallback(args[1].As<v8::Function>());
+  NanAsyncQueueWorker(new MetadataWorker(callback, baton));
+
+  // Increment queued task counter
+  g_atomic_int_inc(&counterQueue);
+
+  NanReturnUndefined();
+}

src/metadata.h

@@ -0,0 +1,8 @@
+#ifndef SHARP_METADATA_H
+#define SHARP_METADATA_H
+
+#include "nan.h"
+
+NAN_METHOD(metadata);
+
+#endif

src/resize.cc

@@ -0,0 +1,876 @@
+#include <tuple>
+#include <algorithm>
+#include <cmath>
+#include <node.h>
+#include <node_buffer.h>
+#include <vips/vips.h>
+
+#include "nan.h"
+
+#include "common.h"
+#include "resize.h"
+
+using namespace v8;
+using namespace sharp;
+
+enum class Canvas {
+  CROP,
+  MAX,
+  EMBED
+};
+
+enum class Angle {
+	D0,
+	D90,
+	D180,
+	D270,
+	DLAST
+};
+
+struct ResizeBaton {
+  std::string fileIn;
+  void* bufferIn;
+  size_t bufferInLength;
+  std::string iccProfileCmyk;
+  std::string output;
+  std::string outputFormat;
+  void* bufferOut;
+  size_t bufferOutLength;
+  int topOffsetPre;
+  int leftOffsetPre;
+  int widthPre;
+  int heightPre;
+  int topOffsetPost;
+  int leftOffsetPost;
+  int widthPost;
+  int heightPost;
+  int width;
+  int height;
+  Canvas canvas;
+  int gravity;
+  std::string interpolator;
+  double background[4];
+  bool flatten;
+  int blurRadius;
+  int sharpenRadius;
+  double sharpenFlat;
+  double sharpenJagged;
+  double gamma;
+  bool greyscale;
+  int angle;
+  bool flip;
+  bool flop;
+  bool progressive;
+  bool withoutEnlargement;
+  VipsAccess accessMethod;
+  int quality;
+  int compressionLevel;
+  bool withoutAdaptiveFiltering;
+  std::string err;
+  bool withMetadata;
+
+  ResizeBaton():
+    bufferInLength(0),
+    outputFormat(""),
+    bufferOutLength(0),
+    topOffsetPre(-1),
+    topOffsetPost(-1),
+    canvas(Canvas::CROP),
+    gravity(0),
+    flatten(false),
+    blurRadius(0),
+    sharpenRadius(0),
+    sharpenFlat(1.0),
+    sharpenJagged(2.0),
+    gamma(0.0),
+    greyscale(false),
+    angle(0),
+    flip(false),
+    flop(false),
+    progressive(false),
+    withoutEnlargement(false),
+    quality(80),
+    compressionLevel(6),
+    withoutAdaptiveFiltering(false),
+    withMetadata(false) {
+      background[0] = 0.0;
+      background[1] = 0.0;
+      background[2] = 0.0;
+      background[3] = 255.0;
+    }
+};
+
+class ResizeWorker : public NanAsyncWorker {
+
+ public:
+  ResizeWorker(NanCallback *callback, ResizeBaton *baton) : NanAsyncWorker(callback), baton(baton) {}
+  ~ResizeWorker() {}
+
+  /*
+    libuv worker
+  */
+  void Execute() {
+    // Decrement queued task counter
+    g_atomic_int_dec_and_test(&counterQueue);
+    // Increment processing task counter
+    g_atomic_int_inc(&counterProcess);
+
+    // Hang image references from this hook object
+    VipsObject *hook = reinterpret_cast<VipsObject*>(vips_image_new());
+
+    // Input
+    ImageType inputImageType = ImageType::UNKNOWN;
+    VipsImage *image;
+    if (baton->bufferInLength > 1) {
+      // From buffer
+      inputImageType = DetermineImageType(baton->bufferIn, baton->bufferInLength);
+      if (inputImageType != ImageType::UNKNOWN) {
+        image = InitImage(inputImageType, baton->bufferIn, baton->bufferInLength, baton->accessMethod);
+      } else {
+        (baton->err).append("Input buffer contains unsupported image format");
+      }
+    } else {
+      // From file
+      inputImageType = DetermineImageType(baton->fileIn.c_str());
+      if (inputImageType != ImageType::UNKNOWN) {
+        image = InitImage(inputImageType, baton->fileIn.c_str(), baton->accessMethod);
+      } else {
+        (baton->err).append("File is of an unsupported image format");
+      }
+    }
+    if (inputImageType == ImageType::UNKNOWN) {
+      return Error(baton, hook);
+    }
+    vips_object_local(hook, image);
+
+    // Pre extraction
+    if (baton->topOffsetPre != -1) {
+      VipsImage *extractedPre;
+      if (vips_extract_area(image, &extractedPre, baton->leftOffsetPre, baton->topOffsetPre, baton->widthPre, baton->heightPre, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, extractedPre);
+      image = extractedPre;
+    }
+
+    // Get input image width and height
+    int inputWidth = image->Xsize;
+    int inputHeight = image->Ysize;
+
+    // Calculate angle of rotation, to be carried out later
+    Angle rotation;
+    bool flip;
+    std::tie(rotation, flip) = CalculateRotationAndFlip(baton->angle, image);
+    if (rotation == Angle::D90 || rotation == Angle::D270) {
+      // Swap input output width and height when rotating by 90 or 270 degrees
+      int swap = inputWidth;
+      inputWidth = inputHeight;
+      inputHeight = swap;
+    }
+    if (flip && !baton->flip) {
+      // Add flip operation due to EXIF mirroring
+      baton->flip = TRUE;
+    }
+
+    // Get window size of interpolator, used for determining shrink vs affine
+    int interpolatorWindowSize = InterpolatorWindowSize(baton->interpolator.c_str());
+
+    // Scaling calculations
+    double factor;
+    if (baton->width > 0 && baton->height > 0) {
+      // Fixed width and height
+      double xfactor = static_cast<double>(inputWidth) / static_cast<double>(baton->width);
+      double yfactor = static_cast<double>(inputHeight) / static_cast<double>(baton->height);
+      factor = (baton->canvas == Canvas::CROP) ? std::min(xfactor, yfactor) : std::max(xfactor, yfactor);
+      // if max is set, we need to compute the real size of the thumb image
+      if (baton->canvas == Canvas::MAX) {
+        if (xfactor > yfactor) {
+          baton->height = round(static_cast<double>(inputHeight) / xfactor);
+        } else {
+          baton->width = round(static_cast<double>(inputWidth) / yfactor);
+        }
+      }
+    } else if (baton->width > 0) {
+      // Fixed width, auto height
+      factor = static_cast<double>(inputWidth) / static_cast<double>(baton->width);
+      baton->height = floor(static_cast<double>(inputHeight) / factor);
+    } else if (baton->height > 0) {
+      // Fixed height, auto width
+      factor = static_cast<double>(inputHeight) / static_cast<double>(baton->height);
+      baton->width = floor(static_cast<double>(inputWidth) / factor);
+    } else {
+      // Identity transform
+      factor = 1;
+      baton->width = inputWidth;
+      baton->height = inputHeight;
+    }
+
+    // Calculate integral box shrink
+    int shrink = 1;
+    if (factor >= 2 && interpolatorWindowSize > 3) {
+      // Shrink less, affine more with interpolators that use at least 4x4 pixel window, e.g. bicubic
+      shrink = floor(factor * 3.0 / interpolatorWindowSize);
+    } else {
+      shrink = floor(factor);
+    }
+    if (shrink < 1) {
+      shrink = 1;
+    }
+
+    // Calculate residual float affine transformation
+    double residual = static_cast<double>(shrink) / factor;
+
+    // Do not enlarge the output if the input width *or* height are already less than the required dimensions
+    if (baton->withoutEnlargement) {
+      if (inputWidth < baton->width || inputHeight < baton->height) {
+        factor = 1;
+        shrink = 1;
+        residual = 0;
+        baton->width = inputWidth;
+        baton->height = inputHeight;
+      }
+    }
+
+    // Try to use libjpeg shrink-on-load, but not when applying gamma correction or pre-resize extract
+    int shrink_on_load = 1;
+    if (inputImageType == ImageType::JPEG && shrink >= 2 && baton->gamma == 0 && baton->topOffsetPre == -1) {
+      if (shrink >= 8) {
+        factor = factor / 8;
+        shrink_on_load = 8;
+      } else if (shrink >= 4) {
+        factor = factor / 4;
+        shrink_on_load = 4;
+      } else if (shrink >= 2) {
+        factor = factor / 2;
+        shrink_on_load = 2;
+      }
+    }
+    if (shrink_on_load > 1) {
+      // Recalculate integral shrink and double residual
+      factor = std::max(factor, 1.0);
+      if (factor >= 2 && interpolatorWindowSize > 3) {
+        shrink = floor(factor * 3.0 / interpolatorWindowSize);
+      } else {
+        shrink = floor(factor);
+      }
+      residual = static_cast<double>(shrink) / factor;
+      // Reload input using shrink-on-load
+      VipsImage *shrunkOnLoad;
+      if (baton->bufferInLength > 1) {
+        if (vips_jpegload_buffer(baton->bufferIn, baton->bufferInLength, &shrunkOnLoad, "shrink", shrink_on_load, NULL)) {
+          return Error(baton, hook);
+        }
+      } else {
+        if (vips_jpegload((baton->fileIn).c_str(), &shrunkOnLoad, "shrink", shrink_on_load, NULL)) {
+          return Error(baton, hook);
+        }
+      }
+      vips_object_local(hook, shrunkOnLoad);
+      image = shrunkOnLoad;
+    }
+
+    // Handle colour profile, if any, for non sRGB images
+    if (image->Type != VIPS_INTERPRETATION_sRGB) {
+      // Get the input colour profile
+      if (vips_image_get_typeof(image, VIPS_META_ICC_NAME)) {
+        VipsImage *profile;
+        // Use embedded profile
+        if (vips_icc_import(image, &profile, "pcs", VIPS_PCS_XYZ, "embedded", TRUE, NULL)) {
+          return Error(baton, hook);
+        }
+        vips_object_local(hook, profile);
+        image = profile;
+      } else if (image->Type == VIPS_INTERPRETATION_CMYK) {
+        VipsImage *profile;
+        // CMYK with no embedded profile
+        if (vips_icc_import(image, &profile, "pcs", VIPS_PCS_XYZ, "input_profile", (baton->iccProfileCmyk).c_str(), NULL)) {
+          return Error(baton, hook);
+        }
+        vips_object_local(hook, profile);
+        image = profile;
+      }
+      // Attempt to convert to sRGB colour space
+      VipsImage *colourspaced;
+      if (vips_colourspace(image, &colourspaced, VIPS_INTERPRETATION_sRGB, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, colourspaced);
+      image = colourspaced;
+    }
+
+    // Flatten image to remove alpha channel
+    if (baton->flatten && HasAlpha(image)) {
+      // Background colour
+      VipsArrayDouble *background = vips_array_double_newv(
+        3, // Ignore alpha channel as we're about to remove it
+        baton->background[0],
+        baton->background[1],
+        baton->background[2]
+      );
+      VipsImage *flattened;
+      if (vips_flatten(image, &flattened, "background", background, NULL)) {
+        vips_area_unref(reinterpret_cast<VipsArea*>(background));
+        return Error(baton, hook);
+      };
+      vips_area_unref(reinterpret_cast<VipsArea*>(background));
+      vips_object_local(hook, flattened);
+      image = flattened;
+    }
+
+    // Gamma encoding (darken)
+    if (baton->gamma >= 1 && baton->gamma <= 3) {
+      VipsImage *gammaEncoded;
+      if (vips_gamma(image, &gammaEncoded, "exponent", 1.0 / baton->gamma, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, gammaEncoded);
+      image = gammaEncoded;
+    }
+
+    // Convert to greyscale (linear, therefore after gamma encoding, if any)
+    if (baton->greyscale) {
+      VipsImage *greyscale;
+      if (vips_colourspace(image, &greyscale, VIPS_INTERPRETATION_B_W, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, greyscale);
+      image = greyscale;
+    }
+
+    if (shrink > 1) {
+      VipsImage *shrunk;
+      // Use vips_shrink with the integral reduction
+      if (vips_shrink(image, &shrunk, shrink, shrink, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, shrunk);
+      image = shrunk;
+      // Recalculate residual float based on dimensions of required vs shrunk images
+      double shrunkWidth = shrunk->Xsize;
+      double shrunkHeight = shrunk->Ysize;
+      if (rotation == Angle::D90 || rotation == Angle::D270) {
+        // Swap input output width and height when rotating by 90 or 270 degrees
+        int swap = shrunkWidth;
+        shrunkWidth = shrunkHeight;
+        shrunkHeight = swap;
+      }
+      double residualx = static_cast<double>(baton->width) / static_cast<double>(shrunkWidth);
+      double residualy = static_cast<double>(baton->height) / static_cast<double>(shrunkHeight);
+      if (baton->canvas == Canvas::EMBED) {
+        residual = std::min(residualx, residualy);
+      } else {
+        residual = std::max(residualx, residualy);
+      }
+    }
+
+    // Use vips_affine with the remaining float part
+    if (residual != 0) {
+      // Apply variable blur radius of floor(residual) before large affine reductions
+      if (residual >= 1) {
+        VipsImage *blurred;
+        if (vips_gaussblur(image, &blurred, floor(residual), NULL)) {
+          return Error(baton, hook);
+        }
+        vips_object_local(hook, blurred);
+        image = blurred;
+      }
+      // Create interpolator - "bilinear" (default), "bicubic" or "nohalo"
+      VipsInterpolate *interpolator = vips_interpolate_new(baton->interpolator.c_str());
+      vips_object_local(hook, interpolator);
+      // Perform affine transformation
+      VipsImage *affined;
+      if (vips_affine(image, &affined, residual, 0, 0, residual, "interpolate", interpolator, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, affined);
+      image = affined;
+    }
+
+    // Rotate
+    if (rotation != Angle::D0) {
+      VipsImage *rotated;
+      if (vips_rot(image, &rotated, static_cast<VipsAngle>(rotation), NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, rotated);
+      image = rotated;
+    }
+
+    // Flip (mirror about Y axis)
+    if (baton->flip) {
+      VipsImage *flipped;
+      if (vips_flip(image, &flipped, VIPS_DIRECTION_VERTICAL, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, flipped);
+      image = flipped;
+    }
+
+    // Flop (mirror about X axis)
+    if (baton->flop) {
+      VipsImage *flopped;
+      if (vips_flip(image, &flopped, VIPS_DIRECTION_HORIZONTAL, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, flopped);
+      image = flopped;
+    }
+
+    // Crop/embed
+    if (image->Xsize != baton->width || image->Ysize != baton->height) {
+      if (baton->canvas == Canvas::EMBED) {
+        // Match background colour space, namely sRGB
+        if (image->Type != VIPS_INTERPRETATION_sRGB) {
+          // Convert to sRGB colour space
+          VipsImage *colourspaced;
+          if (vips_colourspace(image, &colourspaced, VIPS_INTERPRETATION_sRGB, NULL)) {
+            return Error(baton, hook);
+          }
+          vips_object_local(hook, colourspaced);
+          image = colourspaced;
+        }
+        // Add non-transparent alpha channel, if required
+        if (baton->background[3] < 255.0 && !HasAlpha(image)) {
+          // Create single-channel transparency
+          VipsImage *black;
+          if (vips_black(&black, image->Xsize, image->Ysize, "bands", 1, NULL)) {
+            return Error(baton, hook);
+          }
+          vips_object_local(hook, black);
+          // Invert to become non-transparent
+          VipsImage *alpha;
+          if (vips_invert(black, &alpha, NULL)) {
+            return Error(baton, hook);
+          }
+          vips_object_local(hook, alpha);
+          // Append alpha channel to existing image
+          VipsImage *joined;
+          if (vips_bandjoin2(image, alpha, &joined, NULL)) {
+            return Error(baton, hook);
+          }
+          vips_object_local(hook, joined);
+          image = joined;
+        }
+        // Create background
+        VipsArrayDouble *background;
+        if (baton->background[3] < 255.0) {
+          background = vips_array_double_newv(
+            4, baton->background[0], baton->background[1], baton->background[2], baton->background[3]
+          );
+        } else {
+          background = vips_array_double_newv(
+            3, baton->background[0], baton->background[1], baton->background[2]
+          );
+        }
+        // Embed
+        int left = (baton->width - image->Xsize) / 2;
+        int top = (baton->height - image->Ysize) / 2;
+        VipsImage *embedded;
+        if (vips_embed(image, &embedded, left, top, baton->width, baton->height,
+          "extend", VIPS_EXTEND_BACKGROUND, "background", background, NULL
+        )) {
+          vips_area_unref(reinterpret_cast<VipsArea*>(background));
+          return Error(baton, hook);
+        }
+        vips_area_unref(reinterpret_cast<VipsArea*>(background));
+        vips_object_local(hook, embedded);
+        image = embedded;
+      } else {
+        // Crop/max
+        int left;
+        int top;
+        std::tie(left, top) = CalculateCrop(image->Xsize, image->Ysize, baton->width, baton->height, baton->gravity);
+        int width = std::min(image->Xsize, baton->width);
+        int height = std::min(image->Ysize, baton->height);
+        VipsImage *extracted;
+        if (vips_extract_area(image, &extracted, left, top, width, height, NULL)) {
+          return Error(baton, hook);
+        }
+        vips_object_local(hook, extracted);
+        image = extracted;
+      }
+    }
+
+    // Post extraction
+    if (baton->topOffsetPost != -1) {
+      VipsImage *extractedPost;
+      if (vips_extract_area(image, &extractedPost, baton->leftOffsetPost, baton->topOffsetPost, baton->widthPost, baton->heightPost, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, extractedPost);
+      image = extractedPost;
+    }
+
+    // Blur
+    if (baton->blurRadius != 0) {
+      VipsImage *blurred;
+      if (baton->blurRadius == -1) {
+        // Fast, mild blur
+        VipsImage *blur = vips_image_new_matrixv(3, 3,
+          1.0, 1.0, 1.0,
+          1.0, 1.0, 1.0,
+          1.0, 1.0, 1.0);
+        vips_image_set_double(blur, "scale", 9);
+        vips_object_local(hook, blur);
+        if (vips_conv(image, &blurred, blur, NULL)) {
+          return Error(baton, hook);
+        }
+      } else {
+        // Slower, accurate Gaussian blur
+        if (vips_gaussblur(image, &blurred, baton->blurRadius, NULL)) {
+          return Error(baton, hook);
+        }
+      }
+      vips_object_local(hook, blurred);
+      image = blurred;
+    }
+
+    // Sharpen
+    if (baton->sharpenRadius != 0) {
+      VipsImage *sharpened;
+      if (baton->sharpenRadius == -1) {
+        // Fast, mild sharpen
+        VipsImage *sharpen = vips_image_new_matrixv(3, 3,
+          -1.0, -1.0, -1.0,
+          -1.0, 32.0, -1.0,
+          -1.0, -1.0, -1.0);
+        vips_image_set_double(sharpen, "scale", 24);
+        vips_object_local(hook, sharpen);
+        if (vips_conv(image, &sharpened, sharpen, NULL)) {
+          return Error(baton, hook);
+        }
+      } else {
+        // Slow, accurate sharpen in LAB colour space, with control over flat vs jagged areas
+        if (vips_sharpen(image, &sharpened, "radius", baton->sharpenRadius, "m1", baton->sharpenFlat, "m2", baton->sharpenJagged, NULL)) {
+          return Error(baton, hook);
+        }
+      }
+      vips_object_local(hook, sharpened);
+      image = sharpened;
+    }
+
+    // Gamma decoding (brighten)
+    if (baton->gamma >= 1 && baton->gamma <= 3) {
+      VipsImage *gammaDecoded;
+      if (vips_gamma(image, &gammaDecoded, "exponent", baton->gamma, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, gammaDecoded);
+      image = gammaDecoded;
+    }
+
+    // Convert to sRGB colour space, if not already
+    if (image->Type != VIPS_INTERPRETATION_sRGB) {
+      VipsImage *colourspaced;
+      if (vips_colourspace(image, &colourspaced, VIPS_INTERPRETATION_sRGB, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, colourspaced);
+      image = colourspaced;
+    }
+
+#if !(VIPS_MAJOR_VERSION >= 7 && VIPS_MINOR_VERSION >= 40 && VIPS_MINOR_VERSION >= 5)
+    // Generate image tile cache when interlace output is required - no longer required as of libvips 7.40.5+
+    if (baton->progressive) {
+      VipsImage *cached;
+      if (vips_tilecache(image, &cached, "threaded", TRUE, "persistent", TRUE, "max_tiles", -1, NULL)) {
+        return Error(baton, hook);
+      }
+      vips_object_local(hook, cached);
+      image = cached;
+    }
+#endif
+
+    // Output
+    if (baton->output == "__jpeg" || (baton->output == "__input" && inputImageType == ImageType::JPEG)) {
+      // Write JPEG to buffer
+      if (vips_jpegsave_buffer(image, &baton->bufferOut, &baton->bufferOutLength, "strip", !baton->withMetadata,
+        "Q", baton->quality, "optimize_coding", TRUE, "interlace", baton->progressive, NULL)) {
+        return Error(baton, hook);
+      }
+      baton->outputFormat = "jpeg";
+    } else if (baton->output == "__png" || (baton->output == "__input" && inputImageType == ImageType::PNG)) {
+#if (VIPS_MAJOR_VERSION >= 7 && VIPS_MINOR_VERSION >= 41)
+      // Select PNG row filter
+      int filter = baton->withoutAdaptiveFiltering ? VIPS_FOREIGN_PNG_FILTER_NONE : VIPS_FOREIGN_PNG_FILTER_ALL;
+      // Write PNG to buffer
+      if (vips_pngsave_buffer(image, &baton->bufferOut, &baton->bufferOutLength, "strip", !baton->withMetadata,
+        "compression", baton->compressionLevel, "interlace", baton->progressive, "filter", filter, NULL)) {
+        return Error(baton, hook);
+      }
+#else
+      // Write PNG to buffer
+      if (vips_pngsave_buffer(image, &baton->bufferOut, &baton->bufferOutLength, "strip", !baton->withMetadata,
+        "compression", baton->compressionLevel, "interlace", baton->progressive, NULL)) {
+        return Error(baton, hook);
+      }
+#endif
+      baton->outputFormat = "png";
+    } else if (baton->output == "__webp" || (baton->output == "__input" && inputImageType == ImageType::WEBP)) {
+      // Write WEBP to buffer
+      if (vips_webpsave_buffer(image, &baton->bufferOut, &baton->bufferOutLength, "strip", !baton->withMetadata,
+        "Q", baton->quality, NULL)) {
+        return Error(baton, hook);
+      }
+      baton->outputFormat = "webp";
+    } else {
+      bool outputJpeg = IsJpeg(baton->output);
+      bool outputPng = IsPng(baton->output);
+      bool outputWebp = IsWebp(baton->output);
+      bool outputTiff = IsTiff(baton->output);
+      bool matchInput = !(outputJpeg || outputPng || outputWebp || outputTiff);
+      if (outputJpeg || (matchInput && inputImageType == ImageType::JPEG)) {
+        // Write JPEG to file
+        if (vips_jpegsave(image, baton->output.c_str(), "strip", !baton->withMetadata,
+          "Q", baton->quality, "optimize_coding", TRUE, "interlace", baton->progressive, NULL)) {
+          return Error(baton, hook);
+        }
+        baton->outputFormat = "jpeg";
+      } else if (outputPng || (matchInput && inputImageType == ImageType::PNG)) {
+#if (VIPS_MAJOR_VERSION >= 7 && VIPS_MINOR_VERSION >= 41)
+        // Select PNG row filter
+        int filter = baton->withoutAdaptiveFiltering ? VIPS_FOREIGN_PNG_FILTER_NONE : VIPS_FOREIGN_PNG_FILTER_ALL;
+        // Write PNG to file
+        if (vips_pngsave(image, baton->output.c_str(), "strip", !baton->withMetadata,
+          "compression", baton->compressionLevel, "interlace", baton->progressive, "filter", filter, NULL)) {
+          return Error(baton, hook);
+        }
+#else
+        // Write PNG to file
+        if (vips_pngsave(image, baton->output.c_str(), "strip", !baton->withMetadata,
+          "compression", baton->compressionLevel, "interlace", baton->progressive, NULL)) {
+          return Error(baton, hook);
+        }
+#endif
+        baton->outputFormat = "png";
+      } else if (outputWebp || (matchInput && inputImageType == ImageType::WEBP)) {
+        // Write WEBP to file
+        if (vips_webpsave(image, baton->output.c_str(), "strip", !baton->withMetadata,
+          "Q", baton->quality, NULL)) {
+          return Error(baton, hook);
+        }
+        baton->outputFormat = "webp";
+      } else if (outputTiff || (matchInput && inputImageType == ImageType::TIFF)) {
+        // Write TIFF to file
+        if (vips_tiffsave(image, baton->output.c_str(), "strip", !baton->withMetadata,
+          "compression", VIPS_FOREIGN_TIFF_COMPRESSION_JPEG, "Q", baton->quality, NULL)) {
+          return Error(baton, hook);
+        }
+        baton->outputFormat = "tiff";
+      } else {
+        (baton->err).append("Unsupported output " + baton->output);
+        return Error(baton, hook);
+      }
+    }
+    // Clean up any dangling image references
+    g_object_unref(hook);
+    // Clean up libvips' per-request data and threads
+    vips_error_clear();
+    vips_thread_shutdown();
+  }
+
+  void HandleOKCallback () {
+    NanScope();
+
+    Handle<Value> argv[3] = { NanNull(), NanNull(),  NanNull() };
+    if (!baton->err.empty()) {
+      // Error
+      argv[0] = Exception::Error(NanNew<String>(baton->err.data(), baton->err.size()));
+    } else {
+      int width = baton->width;
+      int height = baton->height;
+      if (baton->topOffsetPre != -1 && (baton->width == -1 || baton->height == -1)) {
+        width = baton->widthPre;
+        height = baton->heightPre;
+      }
+      if (baton->topOffsetPost != -1) {
+        width = baton->widthPost;
+        height = baton->heightPost;
+      }
+      // Info Object
+      Local<Object> info = NanNew<Object>();
+      info->Set(NanNew<String>("format"), NanNew<String>(baton->outputFormat));
+      info->Set(NanNew<String>("width"), NanNew<Number>(width));
+      info->Set(NanNew<String>("height"), NanNew<Number>(height));
+
+      if (baton->bufferOutLength > 0) {
+        // Buffer
+        argv[1] = NanNewBufferHandle(static_cast<char*>(baton->bufferOut), baton->bufferOutLength);
+        g_free(baton->bufferOut);
+        argv[2] = info;
+      } else {
+        // File
+        argv[1] = info;
+      }
+    }
+    delete baton;
+
+    // Decrement processing task counter
+    g_atomic_int_dec_and_test(&counterProcess);
+
+    // Return to JavaScript
+    callback->Call(3, argv);
+  }
+
+ private:
+  ResizeBaton* baton;
+
+  /*
+    Calculate the angle of rotation and need-to-flip for the output image.
+    In order of priority:
+     1. Use explicitly requested angle (supports 90, 180, 270)
+     2. Use input image EXIF Orientation header - supports mirroring
+     3. Otherwise default to zero, i.e. no rotation
+  */
+  std::tuple<Angle, bool>
+  CalculateRotationAndFlip(int const angle, VipsImage const *input) {
+    Angle rotate = Angle::D0;
+    bool flip = FALSE;
+    if (angle == -1) {
+      switch(ExifOrientation(input)) {
+        case 6: rotate = Angle::D90; break;
+        case 3: rotate = Angle::D180; break;
+        case 8: rotate = Angle::D270; break;
+        case 2: flip = TRUE; break; // flip 1
+        case 7: flip = TRUE; rotate = Angle::D90; break; // flip 6
+        case 4: flip = TRUE; rotate = Angle::D180; break; // flip 3
+        case 5: flip = TRUE; rotate = Angle::D270; break; // flip 8
+      }
+    } else {
+      if (angle == 90) {
+        rotate = Angle::D90;
+      } else if (angle == 180) {
+        rotate = Angle::D180;
+      } else if (angle == 270) {
+        rotate = Angle::D270;
+      }
+    }
+    return std::make_tuple(rotate, flip);
+  }
+
+  /*
+    Calculate the (left, top) coordinates of the output image
+    within the input image, applying the given gravity.
+  */
+  std::tuple<int, int>
+  CalculateCrop(int const inWidth, int const inHeight, int const outWidth, int const outHeight, int const gravity) {
+    int left = 0;
+    int top = 0;
+    switch (gravity) {
+      case 1: // North
+        left = (inWidth - outWidth + 1) / 2;
+        break;
+      case 2: // East
+        left = inWidth - outWidth;
+        top = (inHeight - outHeight + 1) / 2;
+        break;
+      case 3: // South
+        left = (inWidth - outWidth + 1) / 2;
+        top = inHeight - outHeight;
+        break;
+      case 4: // West
+        top = (inHeight - outHeight + 1) / 2;
+        break;
+      default: // Centre
+        left = (inWidth - outWidth + 1) / 2;
+        top = (inHeight - outHeight + 1) / 2;
+    }
+    return std::make_tuple(left, top);
+  }
+
+  /*
+    Copy then clear the error message.
+    Unref all transitional images on the hook.
+    Clear all thread-local data.
+  */
+  void Error(ResizeBaton *baton, VipsObject *hook) {
+    // Get libvips' error message
+    (baton->err).append(vips_error_buffer());
+    // Clean up any dangling image references
+    g_object_unref(hook);
+    // Clean up libvips' per-request data and threads
+    vips_error_clear();
+    vips_thread_shutdown();
+  }
+};
+
+/*
+  resize(options, output, callback)
+*/
+NAN_METHOD(resize) {
+  NanScope();
+
+  // V8 objects are converted to non-V8 types held in the baton struct
+  ResizeBaton *baton = new ResizeBaton;
+  Local<Object> options = args[0]->ToObject();
+
+  // Input filename
+  baton->fileIn = *String::Utf8Value(options->Get(NanNew<String>("fileIn"))->ToString());
+  baton->accessMethod = options->Get(NanNew<String>("sequentialRead"))->BooleanValue() ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
+  // Input Buffer object
+  if (options->Get(NanNew<String>("bufferIn"))->IsObject()) {
+    Local<Object> buffer = options->Get(NanNew<String>("bufferIn"))->ToObject();
+    baton->bufferInLength = node::Buffer::Length(buffer);
+    baton->bufferIn = node::Buffer::Data(buffer);
+  }
+  // ICC profile to use when input CMYK image has no embedded profile
+  baton->iccProfileCmyk = *String::Utf8Value(options->Get(NanNew<String>("iccProfileCmyk"))->ToString());
+  // Extract image options
+  baton->topOffsetPre = options->Get(NanNew<String>("topOffsetPre"))->Int32Value();
+  baton->leftOffsetPre = options->Get(NanNew<String>("leftOffsetPre"))->Int32Value();
+  baton->widthPre = options->Get(NanNew<String>("widthPre"))->Int32Value();
+  baton->heightPre = options->Get(NanNew<String>("heightPre"))->Int32Value();
+  baton->topOffsetPost = options->Get(NanNew<String>("topOffsetPost"))->Int32Value();
+  baton->leftOffsetPost = options->Get(NanNew<String>("leftOffsetPost"))->Int32Value();
+  baton->widthPost = options->Get(NanNew<String>("widthPost"))->Int32Value();
+  baton->heightPost = options->Get(NanNew<String>("heightPost"))->Int32Value();
+  // Output image dimensions
+  baton->width = options->Get(NanNew<String>("width"))->Int32Value();
+  baton->height = options->Get(NanNew<String>("height"))->Int32Value();
+  // Canvas option
+  Local<String> canvas = options->Get(NanNew<String>("canvas"))->ToString();
+  if (canvas->Equals(NanNew<String>("c"))) {
+    baton->canvas = Canvas::CROP;
+  } else if (canvas->Equals(NanNew<String>("m"))) {
+    baton->canvas = Canvas::MAX;
+  } else if (canvas->Equals(NanNew<String>("e"))) {
+    baton->canvas = Canvas::EMBED;
+  }
+  // Background colour
+  Local<Array> background = Local<Array>::Cast(options->Get(NanNew<String>("background")));
+  for (int i = 0; i < 4; i++) {
+    baton->background[i] = background->Get(i)->NumberValue();
+  }
+  // Resize options
+  baton->withoutEnlargement = options->Get(NanNew<String>("withoutEnlargement"))->BooleanValue();
+  baton->gravity = options->Get(NanNew<String>("gravity"))->Int32Value();
+  baton->interpolator = *String::Utf8Value(options->Get(NanNew<String>("interpolator"))->ToString());
+  // Operators
+  baton->flatten = options->Get(NanNew<String>("flatten"))->BooleanValue();
+  baton->blurRadius = options->Get(NanNew<String>("blurRadius"))->Int32Value();
+  baton->sharpenRadius = options->Get(NanNew<String>("sharpenRadius"))->Int32Value();
+  baton->sharpenFlat = options->Get(NanNew<String>("sharpenFlat"))->NumberValue();
+  baton->sharpenJagged = options->Get(NanNew<String>("sharpenJagged"))->NumberValue();
+  baton->gamma = options->Get(NanNew<String>("gamma"))->NumberValue();
+  baton->greyscale = options->Get(NanNew<String>("greyscale"))->BooleanValue();
+  baton->angle = options->Get(NanNew<String>("angle"))->Int32Value();
+  baton->flip = options->Get(NanNew<String>("flip"))->BooleanValue();
+  baton->flop = options->Get(NanNew<String>("flop"))->BooleanValue();
+  // Output options
+  baton->progressive = options->Get(NanNew<String>("progressive"))->BooleanValue();
+  baton->quality = options->Get(NanNew<String>("quality"))->Int32Value();
+  baton->compressionLevel = options->Get(NanNew<String>("compressionLevel"))->Int32Value();
+  baton->withoutAdaptiveFiltering = options->Get(NanNew<String>("withoutAdaptiveFiltering"))->BooleanValue();
+  baton->withMetadata = options->Get(NanNew<String>("withMetadata"))->BooleanValue();
+  // Output filename or __format for Buffer
+  baton->output = *String::Utf8Value(options->Get(NanNew<String>("output"))->ToString());
+
+  // Join queue for worker thread
+  NanCallback *callback = new NanCallback(args[1].As<v8::Function>());
+  NanAsyncQueueWorker(new ResizeWorker(callback, baton));
+
+  // Increment queued task counter
+  g_atomic_int_inc(&counterQueue);
+
+  NanReturnUndefined();
+}

src/resize.h

@@ -0,0 +1,8 @@
+#ifndef SHARP_RESIZE_H
+#define SHARP_RESIZE_H
+
+#include "nan.h"
+
+NAN_METHOD(resize);
+
+#endif

src/sharp.cc

@@ -1,759 +1,14 @@
 #include <node.h>
-#include <node_buffer.h>
-#include <math.h>
-#include <string>
-#include <string.h>
-#include <tuple>
 #include <vips/vips.h>
 
 #include "nan.h"
 
+#include "common.h"
+#include "metadata.h"
+#include "resize.h"
+#include "utilities.h"
+
 using namespace v8;
-using namespace node;
-
-struct resize_baton {
-  std::string file_in;
-  void* buffer_in;
-  size_t buffer_in_len;
-  std::string output;
-  void* buffer_out;
-  size_t buffer_out_len;
-  int width;
-  int height;
-  bool crop;
-  int gravity;
-  bool max;
-  VipsExtend extend;
-  bool sharpen;
-  std::string interpolator;
-  bool progressive;
-  bool without_enlargement;
-  VipsAccess access_method;
-  int quality;
-  int compressionLevel;
-  int angle;
-  std::string err;
-
-  resize_baton():
-    buffer_in_len(0),
-    buffer_out_len(0),
-    crop(false),
-    gravity(0),
-    max(false),
-    sharpen(false),
-    progressive(false),
-    without_enlargement(false) {}
-};
-
-typedef enum {
-  UNKNOWN,
-  JPEG,
-  PNG,
-  WEBP,
-  TIFF,
-  MAGICK
-} ImageType;
-
-unsigned char const MARKER_JPEG[] = {0xff, 0xd8};
-unsigned char const MARKER_PNG[] = {0x89, 0x50};
-unsigned char const MARKER_WEBP[] = {0x52, 0x49};
-
-// How many tasks are in the queue?
-volatile int counter_queue = 0;
-// How many tasks are being processed?
-volatile int counter_process = 0;
-
-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);
-}
-
-static bool is_jpeg(std::string const &str) {
-  return ends_with(str, ".jpg") || ends_with(str, ".jpeg") || ends_with(str, ".JPG") || ends_with(str, ".JPEG");
-}
-
-static bool is_png(std::string const &str) {
-  return ends_with(str, ".png") || ends_with(str, ".PNG");
-}
-
-static bool is_webp(std::string const &str) {
-  return ends_with(str, ".webp") || ends_with(str, ".WEBP");
-}
-
-static bool is_tiff(std::string const &str) {
-  return ends_with(str, ".tif") || ends_with(str, ".tiff") || ends_with(str, ".TIF") || ends_with(str, ".TIFF");
-}
-
-static void resize_error(resize_baton *baton, VipsImage *unref) {
-  (baton->err).append(vips_error_buffer());
-  vips_error_clear();
-  g_object_unref(unref);
-  vips_thread_shutdown();
-  return;
-}
-
-/*
-  Calculate the angle of rotation for the output image.
-  In order of priority:
-   1. Use explicitly requested angle (supports 90, 180, 270)
-   2. Use input image EXIF Orientation header (does not support mirroring)
-   3. Otherwise default to zero, i.e. no rotation
-*/
-static VipsAngle
-sharp_calc_rotation(int const angle, VipsImage const *input) {
-  VipsAngle rotate = VIPS_ANGLE_0;
-  if (angle == -1) {
-    const char *exif;
-    if (!vips_image_get_string(input, "exif-ifd0-Orientation", &exif)) {
-      if (exif[0] == 0x36) { // "6"
-        rotate = VIPS_ANGLE_90;
-      } else if (exif[0] == 0x33) { // "3"
-        rotate = VIPS_ANGLE_180;
-      } else if (exif[0] == 0x38) { // "8"
-        rotate = VIPS_ANGLE_270;
-      }
-    }
-  } else {
-    if (angle == 90) {
-      rotate = VIPS_ANGLE_90;
-    } else if (angle == 180) {
-      rotate = VIPS_ANGLE_180;
-    } else if (angle == 270) {
-      rotate = VIPS_ANGLE_270;
-    }
-  }
-  return rotate;
-}
-
-/*
-  Calculate the (left, top) coordinates of the output image
-  within the input image, applying the given gravity.
-*/
-static std::tuple<int, int>
-sharp_calc_crop(int const inWidth, int const inHeight, int const outWidth, int const outHeight, int const gravity) {
-  int left = 0;
-  int top = 0;
-  switch (gravity) {
-    case 1: // North
-      left = (inWidth - outWidth + 1) / 2;
-      break;
-    case 2: // East
-      left = inWidth - outWidth;
-      top = (inHeight - outHeight + 1) / 2;
-      break;
-    case 3: // South
-      left = (inWidth - outWidth + 1) / 2;
-      top = inHeight - outHeight;
-      break;
-    case 4: // West
-      top = (inHeight - outHeight + 1) / 2;
-      break;
-    default: // Centre
-      left = (inWidth - outWidth + 1) / 2;
-      top = (inHeight - outHeight + 1) / 2;
-  }
-  return std::make_tuple(left, top);
-}
-
-/*
-  Initialise a VipsImage from a buffer. Supports JPEG, PNG and WebP.
-  Returns the ImageType detected, if any.
-*/
-static 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;
-    }
-  }
-  return imageType;
-}
-
-/*
-  Initialise a VipsImage from a file.
-  Returns the ImageType detected, if any.
-*/
-static 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;
-    }
-  }
-  return imageType;
-}
-
-// Metadata
-
-struct metadata_baton {
-  // Input
-  std::string file_in;
-  void* buffer_in;
-  size_t buffer_in_len;
-  // Output
-  std::string format;
-  int width;
-  int height;
-  std::string space;
-  int channels;
-  int orientation;
-  std::string err;
-
-  metadata_baton():
-    buffer_in_len(0),
-    orientation(0) {}
-};
-
-class MetadataWorker : public NanAsyncWorker {
-
-  public:
-    MetadataWorker(NanCallback *callback, metadata_baton *baton) : NanAsyncWorker(callback), baton(baton) {}
-    ~MetadataWorker() {}
-
-  void Execute() {
-    // Decrement queued task counter
-    g_atomic_int_dec_and_test(&counter_queue);
-
-    ImageType imageType = UNKNOWN;
-    VipsImage *image = vips_image_new();
-    if (baton->buffer_in_len > 1) {
-      // From buffer
-      imageType = sharp_init_image_from_buffer(&image, baton->buffer_in, baton->buffer_in_len, VIPS_ACCESS_RANDOM);
-      if (imageType == UNKNOWN) {
-        (baton->err).append("Input buffer contains unsupported image format");
-      }
-    } else {
-      // From file
-      imageType = sharp_init_image_from_file(&image, baton->file_in.c_str(), VIPS_ACCESS_RANDOM);
-      if (imageType == UNKNOWN) {
-        (baton->err).append("File is of an unsupported image format");
-      }
-    }
-    if (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 = "";
-      }
-      // VipsImage attributes
-      baton->width = image->Xsize;
-      baton->height = image->Ysize;
-      baton->space = vips_enum_nick(VIPS_TYPE_INTERPRETATION, image->Type);
-      baton->channels = image->Bands;
-      // EXIF Orientation
-      const char *exif;
-      if (!vips_image_get_string(image, "exif-ifd0-Orientation", &exif)) {
-        baton->orientation = atoi(&exif[0]);
-      }
-    }
-    // Clean up
-    g_object_unref(image);
-    vips_error_clear();
-    vips_thread_shutdown();
-  }
-
-  void HandleOKCallback () {
-    NanScope();
-
-    Handle<Value> argv[2] = { NanNull(), NanNull() };
-    if (!baton->err.empty()) {
-      // Error
-      argv[0] = NanNew<String>(baton->err.data(), baton->err.size());
-    } else {
-      // Metadata Object
-      Local<Object> info = NanNew<Object>();
-      info->Set(NanNew<String>("format"), NanNew<String>(baton->format));
-      info->Set(NanNew<String>("width"), NanNew<Number>(baton->width));
-      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));
-      if (baton->orientation > 0) {
-        info->Set(NanNew<String>("orientation"), NanNew<Number>(baton->orientation));
-      }
-      argv[1] = info;
-    }
-    delete baton;
-
-    // Return to JavaScript
-    callback->Call(2, argv);
-  }
-
-  private:
-    metadata_baton* baton;
-};
-
-/*
-  metadata(options, callback)
-*/
-NAN_METHOD(metadata) {
-  NanScope();
-
-  // V8 objects are converted to non-V8 types held in the baton struct
-  metadata_baton *baton = new metadata_baton;
-  Local<Object> options = args[0]->ToObject();
-
-  // Input filename
-  baton->file_in = *String::Utf8Value(options->Get(NanNew<String>("fileIn"))->ToString());
-  // Input Buffer object
-  if (options->Get(NanNew<String>("bufferIn"))->IsObject()) {
-    Local<Object> buffer = options->Get(NanNew<String>("bufferIn"))->ToObject();
-    baton->buffer_in_len = Buffer::Length(buffer);
-    baton->buffer_in = Buffer::Data(buffer);
-  }
-
-  // Join queue for worker thread
-  NanCallback *callback = new NanCallback(args[1].As<v8::Function>());
-  NanAsyncQueueWorker(new MetadataWorker(callback, baton));
-
-  // Increment queued task counter
-  g_atomic_int_inc(&counter_queue);
-
-  NanReturnUndefined();
-}
-
-// Resize
-
-class ResizeWorker : public NanAsyncWorker {
-  public:
-    ResizeWorker(NanCallback *callback, resize_baton *baton) : NanAsyncWorker(callback), baton(baton) {}
-    ~ResizeWorker() {}
-
-  void Execute() {
-    // Decrement queued task counter
-    g_atomic_int_dec_and_test(&counter_queue);
-    // Increment processing task counter
-    g_atomic_int_inc(&counter_process);
-
-    // Input
-    ImageType inputImageType = UNKNOWN;
-    VipsImage *in = vips_image_new();
-    if (baton->buffer_in_len > 1) {
-      // From buffer
-      inputImageType = sharp_init_image_from_buffer(&in, baton->buffer_in, baton->buffer_in_len, baton->access_method);
-      if (inputImageType == UNKNOWN) {
-        (baton->err).append("Input buffer contains unsupported image format");
-      }
-    } else {
-      // From file
-      inputImageType = sharp_init_image_from_file(&in, baton->file_in.c_str(), baton->access_method);
-      if (inputImageType == UNKNOWN) {
-        (baton->err).append("File is of an unsupported image format");
-      }
-    }
-    if (inputImageType == UNKNOWN) {
-      return resize_error(baton, in);
-    }
-
-    // Get input image width and height
-    int inputWidth = in->Xsize;
-    int inputHeight = in->Ysize;
-
-    // Calculate angle of rotation, to be carried out later
-    VipsAngle rotation = sharp_calc_rotation(baton->angle, in);
-    if (rotation == VIPS_ANGLE_90 || rotation == VIPS_ANGLE_270) {
-      // Swap input output width and height when rotating by 90 or 270 degrees
-      int swap = inputWidth;
-      inputWidth = inputHeight;
-      inputHeight = swap;
-    }
-
-    // Scaling calculations
-    double factor;
-    if (baton->width > 0 && baton->height > 0) {
-      // Fixed width and height
-      double xfactor = static_cast<double>(inputWidth) / static_cast<double>(baton->width);
-      double yfactor = static_cast<double>(inputHeight) / static_cast<double>(baton->height);
-      factor = baton->crop ? std::min(xfactor, yfactor) : std::max(xfactor, yfactor);
-      // if max is set, we need to compute the real size of the thumb image
-      if (baton->max) {
-        if (xfactor > yfactor) {
-          baton->height = round(static_cast<double>(inputHeight) / xfactor);
-        } else {
-          baton->width = round(static_cast<double>(inputWidth) / yfactor);
-        }
-      }
-    } else if (baton->width > 0) {
-      // Fixed width, auto height
-      factor = static_cast<double>(inputWidth) / static_cast<double>(baton->width);
-      baton->height = floor(static_cast<double>(inputHeight) / factor);
-    } else if (baton->height > 0) {
-      // Fixed height, auto width
-      factor = static_cast<double>(inputHeight) / static_cast<double>(baton->height);
-      baton->width = floor(static_cast<double>(inputWidth) / factor);
-    } else {
-      // Identity transform
-      factor = 1;
-      baton->width = inputWidth;
-      baton->height = inputHeight;
-    }
-    int shrink = floor(factor);
-    if (shrink < 1) {
-      shrink = 1;
-    }
-    double residual = static_cast<double>(shrink) / factor;
-
-    // Do not enlarge the output if the input width *or* height are already less than the required dimensions
-    if (baton->without_enlargement) {
-      if (inputWidth < baton->width || inputHeight < baton->height) {
-        factor = 1;
-        shrink = 1;
-        residual = 0;
-        baton->width = inputWidth;
-        baton->height = inputHeight;
-      }
-    }
-
-    // Try to use libjpeg shrink-on-load
-    int shrink_on_load = 1;
-    if (inputImageType == JPEG) {
-      if (shrink >= 8) {
-        factor = factor / 8;
-        shrink_on_load = 8;
-      } else if (shrink >= 4) {
-        factor = factor / 4;
-        shrink_on_load = 4;
-      } else if (shrink >= 2) {
-        factor = factor / 2;
-        shrink_on_load = 2;
-      }
-    }
-    VipsImage *shrunk_on_load = vips_image_new();
-    if (shrink_on_load > 1) {
-      // Recalculate integral shrink and double residual
-      factor = std::max(factor, 1.0);
-      shrink = floor(factor);
-      residual = static_cast<double>(shrink) / factor;
-      // Reload input using shrink-on-load
-      if (baton->buffer_in_len > 1) {
-        if (vips_jpegload_buffer(baton->buffer_in, baton->buffer_in_len, &shrunk_on_load, "shrink", shrink_on_load, NULL)) {
-          return resize_error(baton, in);
-        }
-      } else {
-        if (vips_jpegload((baton->file_in).c_str(), &shrunk_on_load, "shrink", shrink_on_load, NULL)) {
-          return resize_error(baton, in);
-        }
-      }
-    } else {
-      vips_copy(in, &shrunk_on_load, NULL);
-    }
-    g_object_unref(in);
-
-    VipsImage *shrunk = vips_image_new();
-    if (shrink > 1) {
-      // Use vips_shrink with the integral reduction
-      if (vips_shrink(shrunk_on_load, &shrunk, shrink, shrink, NULL)) {
-        return resize_error(baton, shrunk_on_load);
-      }
-      // Recalculate residual float based on dimensions of required vs shrunk images
-      double shrunkWidth = shrunk->Xsize;
-      double shrunkHeight = shrunk->Ysize;
-      if (rotation == VIPS_ANGLE_90 || rotation == VIPS_ANGLE_270) {
-        // Swap input output width and height when rotating by 90 or 270 degrees
-        int swap = shrunkWidth;
-        shrunkWidth = shrunkHeight;
-        shrunkHeight = swap;
-      }
-      double residualx = static_cast<double>(baton->width) / static_cast<double>(shrunkWidth);
-      double residualy = static_cast<double>(baton->height) / static_cast<double>(shrunkHeight);
-      if (baton->crop || baton->max) {
-        residual = std::max(residualx, residualy);
-      } else {
-        residual = std::min(residualx, residualy);
-      }
-    } else {
-      vips_copy(shrunk_on_load, &shrunk, NULL);
-    }
-    g_object_unref(shrunk_on_load);
-
-    // Use vips_affine with the remaining float part
-    VipsImage *affined = vips_image_new();
-    if (residual != 0) {
-      // Create interpolator - "bilinear" (default), "bicubic" or "nohalo"
-      VipsInterpolate *interpolator = vips_interpolate_new(baton->interpolator.c_str());
-      // Perform affine transformation
-      if (vips_affine(shrunk, &affined, residual, 0, 0, residual, "interpolate", interpolator, NULL)) {
-        g_object_unref(interpolator);
-        return resize_error(baton, shrunk);
-      }
-      g_object_unref(interpolator);
-    } else {
-      vips_copy(shrunk, &affined, NULL);
-    }
-    g_object_unref(shrunk);
-
-    // Rotate
-    VipsImage *rotated = vips_image_new();
-    if (rotation != VIPS_ANGLE_0) {
-      if (vips_rot(affined, &rotated, rotation, NULL)) {
-        return resize_error(baton, affined);
-      }
-    } else {
-      vips_copy(affined, &rotated, NULL);
-    }
-    g_object_unref(affined);
-
-    // Crop/embed
-    VipsImage *canvased = vips_image_new();
-    if (rotated->Xsize != baton->width || rotated->Ysize != baton->height) {
-      if (baton->crop || baton->max) {
-        // Crop/max
-        int left;
-        int top;
-        std::tie(left, top) = sharp_calc_crop(rotated->Xsize, rotated->Ysize, baton->width, baton->height, baton->gravity);
-        int width = std::min(rotated->Xsize, baton->width);
-        int height = std::min(rotated->Ysize, baton->height);
-        if (vips_extract_area(rotated, &canvased, left, top, width, height, NULL)) {
-          return resize_error(baton, rotated);
-        }
-      } else {
-        // Embed
-        int left = (baton->width - rotated->Xsize) / 2;
-        int top = (baton->height - rotated->Ysize) / 2;
-        if (vips_embed(rotated, &canvased, left, top, baton->width, baton->height, "extend", baton->extend, NULL)) {
-          return resize_error(baton, rotated);
-        }
-      }
-    } else {
-      vips_copy(rotated, &canvased, NULL);
-    }
-    g_object_unref(rotated);
-
-    // Mild sharpen
-    VipsImage *sharpened = vips_image_new();
-    if (baton->sharpen) {
-      VipsImage *sharpen = vips_image_new_matrixv(3, 3,
-        -1.0, -1.0, -1.0,
-        -1.0, 32.0, -1.0,
-        -1.0, -1.0, -1.0);
-      vips_image_set_double(sharpen, "scale", 24);
-      if (vips_conv(canvased, &sharpened, sharpen, NULL)) {
-        g_object_unref(sharpen);
-        return resize_error(baton, canvased);
-      }
-      g_object_unref(sharpen);
-    } else {
-      vips_copy(canvased, &sharpened, NULL);
-    }
-    g_object_unref(canvased);
-
-    // Always convert to sRGB colour space
-    VipsImage *colourspaced = vips_image_new();
-    vips_colourspace(sharpened, &colourspaced, VIPS_INTERPRETATION_sRGB, NULL);
-    g_object_unref(sharpened);
-
-    // Generate image tile cache when interlace output is required
-    VipsImage *cached = vips_image_new();
-    if (baton->progressive) {
-      if (vips_tilecache(colourspaced, &cached, "threaded", TRUE, "persistent", TRUE, "max_tiles", -1, NULL)) {
-        return resize_error(baton, colourspaced);
-      }
-    } else {
-      vips_copy(colourspaced, &cached, NULL);
-    }
-    g_object_unref(colourspaced);
-
-    // Output
-    VipsImage *output = cached;
-    if (baton->output == "__jpeg" || (baton->output == "__input" && inputImageType == JPEG)) {
-      // Write JPEG to buffer
-      if (vips_jpegsave_buffer(output, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "Q", baton->quality, "optimize_coding", TRUE, "interlace", baton->progressive, NULL)) {
-        return resize_error(baton, output);
-      }
-    } else if (baton->output == "__png" || (baton->output == "__input" && inputImageType == PNG)) {
-      // Write PNG to buffer
-      if (vips_pngsave_buffer(output, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "compression", baton->compressionLevel, "interlace", baton->progressive, NULL)) {
-        return resize_error(baton, output);
-      }
-    } else if (baton->output == "__webp" || (baton->output == "__input" && inputImageType == WEBP)) {
-      // Write WEBP to buffer
-      if (vips_webpsave_buffer(output, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "Q", baton->quality, NULL)) {
-        return resize_error(baton, output);
-      }
-    } else if (is_jpeg(baton->output))  {
-      // Write JPEG to file
-      if (vips_jpegsave(output, baton->output.c_str(), "strip", TRUE, "Q", baton->quality, "optimize_coding", TRUE, "interlace", baton->progressive, NULL)) {
-        return resize_error(baton, output);
-      }
-    } else if (is_png(baton->output)) {
-      // Write PNG to file
-      if (vips_pngsave(output, baton->output.c_str(), "strip", TRUE, "compression", baton->compressionLevel, "interlace", baton->progressive, NULL)) {
-        return resize_error(baton, output);
-      }
-    } else if (is_webp(baton->output)) {
-      // Write WEBP to file
-      if (vips_webpsave(output, baton->output.c_str(), "strip", TRUE, "Q", baton->quality, NULL)) {
-        return resize_error(baton, output);
-      }
-    } else if (is_tiff(baton->output)) {
-      // Write TIFF to file
-      if (vips_tiffsave(output, baton->output.c_str(), "strip", TRUE, "compression", VIPS_FOREIGN_TIFF_COMPRESSION_JPEG, "Q", baton->quality, NULL)) {
-        return resize_error(baton, output);
-      }
-    } else {
-      (baton->err).append("Unsupported output " + baton->output);
-    }
-    g_object_unref(output);
-
-    // Clean up libvips' per-request data and threads
-    vips_error_clear();
-    vips_thread_shutdown();
-  }
-
-  void HandleOKCallback () {
-    NanScope();
-
-    Handle<Value> argv[3] = { NanNull(), NanNull(),  NanNull() };
-    if (!baton->err.empty()) {
-      // Error
-      argv[0] = NanNew<String>(baton->err.data(), baton->err.size());
-    } else {
-      // Info Object
-      Local<Object> info = NanNew<Object>();
-      info->Set(NanNew<String>("width"), NanNew<Number>(baton->width));
-      info->Set(NanNew<String>("height"), NanNew<Number>(baton->height));
-
-      if (baton->buffer_out_len > 0) {
-        // Buffer
-        argv[1] = NanNewBufferHandle((char *)baton->buffer_out, baton->buffer_out_len);
-        g_free(baton->buffer_out);
-        argv[2] = info;
-      } else {
-        // File
-        argv[1] = info;
-      }
-    }
-    delete baton;
-
-    // Decrement processing task counter
-    g_atomic_int_dec_and_test(&counter_process);
-
-    // Return to JavaScript
-    callback->Call(3, argv);
-  }
-
- private:
-  resize_baton* baton;
-};
-
-/*
-  resize(options, output, callback)
-*/
-NAN_METHOD(resize) {
-  NanScope();
-
-  // V8 objects are converted to non-V8 types held in the baton struct
-  resize_baton *baton = new resize_baton;
-  Local<Object> options = args[0]->ToObject();
-
-  // Input filename
-  baton->file_in = *String::Utf8Value(options->Get(NanNew<String>("fileIn"))->ToString());
-  // Input Buffer object
-  if (options->Get(NanNew<String>("bufferIn"))->IsObject()) {
-    Local<Object> buffer = options->Get(NanNew<String>("bufferIn"))->ToObject();
-    baton->buffer_in_len = Buffer::Length(buffer);
-    baton->buffer_in = Buffer::Data(buffer);
-  }
-  // Output image dimensions
-  baton->width = options->Get(NanNew<String>("width"))->Int32Value();
-  baton->height = options->Get(NanNew<String>("height"))->Int32Value();
-  // Canvas options
-  Local<String> canvas = options->Get(NanNew<String>("canvas"))->ToString();
-  if (canvas->Equals(NanNew<String>("c"))) {
-    baton->crop = true;
-  } else if (canvas->Equals(NanNew<String>("w"))) {
-    baton->extend = VIPS_EXTEND_WHITE;
-  } else if (canvas->Equals(NanNew<String>("b"))) {
-    baton->extend = VIPS_EXTEND_BLACK;
-  } else if (canvas->Equals(NanNew<String>("m"))) {
-    baton->max = true;
-  }
-  // Other options
-  baton->gravity = options->Get(NanNew<String>("gravity"))->Int32Value();
-  baton->sharpen = options->Get(NanNew<String>("sharpen"))->BooleanValue();
-  baton->interpolator = *String::Utf8Value(options->Get(NanNew<String>("interpolator"))->ToString());
-  baton->progressive = options->Get(NanNew<String>("progressive"))->BooleanValue();
-  baton->without_enlargement = options->Get(NanNew<String>("withoutEnlargement"))->BooleanValue();
-  baton->access_method = options->Get(NanNew<String>("sequentialRead"))->BooleanValue() ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
-  baton->quality = options->Get(NanNew<String>("quality"))->Int32Value();
-  baton->compressionLevel = options->Get(NanNew<String>("compressionLevel"))->Int32Value();
-  baton->angle = options->Get(NanNew<String>("angle"))->Int32Value();
-  // Output filename or __format for Buffer
-  baton->output = *String::Utf8Value(options->Get(NanNew<String>("output"))->ToString());
-
-  // Join queue for worker thread
-  NanCallback *callback = new NanCallback(args[1].As<v8::Function>());
-  NanAsyncQueueWorker(new ResizeWorker(callback, baton));
-
-  // Increment queued task counter
-  g_atomic_int_inc(&counter_queue);
-
-  NanReturnUndefined();
-}
-
-/*
-  Get and set cache memory and item limits
-*/
-NAN_METHOD(cache) {
-  NanScope();
-
-  // Set cache memory limit
-  if (args[0]->IsInt32()) {
-    vips_cache_set_max_mem(args[0]->Int32Value() * 1048576);
-  }
-
-  // Set cache items limit
-  if (args[1]->IsInt32()) {
-    vips_cache_set_max(args[1]->Int32Value());
-  }
-
-  // Get cache statistics
-  Local<Object> cache = NanNew<Object>();
-  cache->Set(NanNew<String>("current"), NanNew<Number>(vips_tracked_get_mem() / 1048576));
-  cache->Set(NanNew<String>("high"), NanNew<Number>(vips_tracked_get_mem_highwater() / 1048576));
-  cache->Set(NanNew<String>("memory"), NanNew<Number>(vips_cache_get_max_mem() / 1048576));
-  cache->Set(NanNew<String>("items"), NanNew<Number>(vips_cache_get_max()));
-  NanReturnValue(cache);
-}
-
-/*
-  Get internal counters (queued tasks, processing tasks)
-*/
-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));
-  NanReturnValue(counters);
-}
 
 static void at_exit(void* arg) {
   NanScope();
@@ -762,16 +17,23 @@ static void at_exit(void* arg) {
 
 extern "C" void init(Handle<Object> target) {
   NanScope();
-  vips_init("");
+  vips_init("sharp");
-  AtExit(at_exit);
+  node::AtExit(at_exit);
+
   // Set libvips operation cache limits
   vips_cache_set_max_mem(100 * 1048576); // 100 MB
   vips_cache_set_max(500); // 500 operations
+
+  // Notify the V8 garbage collector of max cache size
+  NanAdjustExternalMemory(vips_cache_get_max_mem());
+
   // Methods available to JavaScript
   NODE_SET_METHOD(target, "metadata", metadata);
   NODE_SET_METHOD(target, "resize", resize);
   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)

src/utilities.cc

@@ -0,0 +1,75 @@
+#include <node.h>
+#include <vips/vips.h>
+
+#include "nan.h"
+
+#include "common.h"
+#include "utilities.h"
+
+using namespace v8;
+using namespace sharp;
+
+/*
+  Get and set cache memory and item limits
+*/
+NAN_METHOD(cache) {
+  NanScope();
+
+  // Set cache memory limit
+  if (args[0]->IsInt32()) {
+    int newMax = args[0]->Int32Value() * 1048576;
+    int oldMax = vips_cache_get_max_mem();
+    vips_cache_set_max_mem(newMax);
+
+    // Notify the V8 garbage collector of delta in max cache size
+    NanAdjustExternalMemory(newMax - oldMax);
+  }
+
+  // Set cache items limit
+  if (args[1]->IsInt32()) {
+    vips_cache_set_max(args[1]->Int32Value());
+  }
+
+  // Get cache statistics
+  Local<Object> cache = NanNew<Object>();
+  cache->Set(NanNew<String>("current"), NanNew<Number>(vips_tracked_get_mem() / 1048576));
+  cache->Set(NanNew<String>("high"), NanNew<Number>(vips_tracked_get_mem_highwater() / 1048576));
+  cache->Set(NanNew<String>("memory"), NanNew<Number>(vips_cache_get_max_mem() / 1048576));
+  cache->Set(NanNew<String>("items"), NanNew<Number>(vips_cache_get_max()));
+  NanReturnValue(cache);
+}
+
+/*
+  Get and set size of thread pool
+*/
+NAN_METHOD(concurrency) {
+  NanScope();
+
+  // Set concurrency
+  if (args[0]->IsInt32()) {
+    vips_concurrency_set(args[0]->Int32Value());
+  }
+  // Get concurrency
+  NanReturnValue(NanNew<Number>(vips_concurrency_get()));
+}
+
+/*
+  Get internal counters (queued tasks, processing tasks)
+*/
+NAN_METHOD(counters) {
+  NanScope();
+  Local<Object> counters = NanNew<Object>();
+  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, 9, "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
+  NanReturnValue(NanNew<String>(version));
+}

src/utilities.h

@@ -0,0 +1,11 @@
+#ifndef SHARP_UTILITIES_H
+#define SHARP_UTILITIES_H
+
+#include "nan.h"
+
+NAN_METHOD(cache);
+NAN_METHOD(concurrency);
+NAN_METHOD(counters);
+NAN_METHOD(libvipsVersion);
+
+#endif

test/bench/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "sharp-benchmark",
+  "version": "0.0.1",
+  "private": true,
+  "author": "Lovell Fuller <npm@lovell.info>",
+  "description": "Benchmark and performance tests for sharp",
+  "scripts": {
+    "test": "node perf && node random && node parallel"
+  },
+  "devDependencies": {
+    "imagemagick": "^0.1.3",
+    "imagemagick-native": "^1.5.0",
+    "gm": "^1.17.0",
+    "async": "^0.9.0",
+    "semver": "^4.1.0",
+    "benchmark": "^1.0.0"
+  },
+  "license": "Apache 2.0",
+  "engines": {
+    "node": ">=0.10"
+  }
+}

test/bench/parallel.js

@@ -1,22 +1,26 @@
-var sharp = require("../index");
+'use strict';
-var fs = require("fs");
+
-var path = require("path");
+var assert = require('assert');
-var assert = require("assert");
+var async = require('async');
-var async = require("async");
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
 
-var inputJpg = path.join(__dirname, "fixtures/2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/
 var width = 720;
 var height = 480;
 
+sharp.concurrency(1);
+
 var timer = setInterval(function() {
-  console.dir(sharp.cache());
+  console.dir(sharp.counters());
 }, 100);
 
 async.mapSeries([1, 1, 2, 4, 8, 16, 32, 64, 128], function(parallelism, next) {
   var start = new Date().getTime();
   async.times(parallelism,
     function(id, callback) {
-      sharp(inputJpg).resize(width, height).toBuffer(function(err, buffer) {
+      /*jslint unused: false */
+      sharp(fixtures.inputJpg).resize(width, height).toBuffer(function(err, buffer) {
         buffer = null;
         callback(err, new Date().getTime() - start);
       });
@@ -27,11 +31,11 @@ async.mapSeries([1, 1, 2, 4, 8, 16, 32, 64, 128], function(parallelism, next) {
       var mean = ids.reduce(function(a, b) {
         return a + b;
       }) / ids.length;
-      console.log(parallelism + " parallel calls: fastest=" + ids[0] + "ms slowest=" + ids[ids.length - 1] + "ms mean=" + mean + "ms");
+      console.log(parallelism + ' parallel calls: fastest=' + ids[0] + 'ms slowest=' + ids[ids.length - 1] + 'ms mean=' + mean + 'ms');
       next();
     }
   );
 }, function() {
   clearInterval(timer);
-  console.dir(sharp.cache());
+  console.dir(sharp.counters());
 });

test/bench/perf.js

@@ -1,28 +1,18 @@
-var sharp = require("../index");
+'use strict';
-var fs = require("fs");
-var path = require("path");
-var imagemagick = require("imagemagick");
-var imagemagickNative = require("imagemagick-native");
-var gm = require("gm");
-var async = require("async");
-var assert = require("assert");
-var Benchmark = require("benchmark");
 
-var fixturesPath = path.join(__dirname, "fixtures");
+var fs = require('fs');
 
-var inputJpg = path.join(fixturesPath, "2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/
+var async = require('async');
-var outputJpg = path.join(fixturesPath, "output.jpg");
+var assert = require('assert');
+var Benchmark = require('benchmark');
+var semver = require('semver');
 
-var inputPng = path.join(fixturesPath, "50020484-00001.png"); // http://c.searspartsdirect.com/lis_png/PLDM/50020484-00001.png
+var imagemagick = require('imagemagick');
-var outputPng = path.join(fixturesPath, "output.png");
+var imagemagickNative = require('imagemagick-native');
+var gm = require('gm');
+var sharp = require('../../index');
 
-var inputWebp = path.join(fixturesPath, "4.webp"); // http://www.gstatic.com/webp/gallery/4.webp
+var fixtures = require('../fixtures');
-var outputWebp = path.join(fixturesPath, "output.webp");
-
-var inputTiff = path.join(fixturesPath, "G31D.TIF"); // http://www.fileformat.info/format/tiff/sample/e6c9a6e5253348f4aef6d17b534360ab/index.htm
-var outputTiff = path.join(fixturesPath, "output.tiff");
-
-var inputGif = path.join(fixturesPath, "Crash_test.gif"); // http://upload.wikimedia.org/wikipedia/commons/e/e3/Crash_test.gif
 
 var width = 720;
 var height = 480;
@@ -32,13 +22,13 @@ sharp.cache(0);
 
 async.series({
   jpeg: function(callback) {
-    var inputJpgBuffer = fs.readFileSync(inputJpg);
+    var inputJpgBuffer = fs.readFileSync(fixtures.inputJpg);
-    (new Benchmark.Suite("jpeg")).add("imagemagick-file-file", {
+    (new Benchmark.Suite('jpeg')).add('imagemagick-file-file', {
       defer: true,
       fn: function(deferred) {
         imagemagick.resize({
-          srcPath: inputJpg,
+          srcPath: fixtures.inputJpg,
-          dstPath: outputJpg,
+          dstPath: fixtures.outputJpg,
           quality: 0.8,
           width: width,
           height: height
@@ -50,7 +40,7 @@ async.series({
           }
         });
       }
-    }).add("imagemagick-native-buffer-buffer", {
+    }).add('imagemagick-native-buffer-buffer', {
       defer: true,
       fn: function(deferred) {
         imagemagickNative.convert({
@@ -62,10 +52,10 @@ async.series({
         });
         deferred.resolve();
       }
-    }).add("gm-buffer-file", {
+    }).add('gm-buffer-file', {
       defer: true,
       fn: function(deferred) {
-        gm(inputJpgBuffer).resize(width, height).quality(80).write(outputJpg, function (err) {
+        gm(inputJpgBuffer).resize(width, height).quality(80).write(fixtures.outputJpg, function (err) {
           if (err) {
             throw err;
           } else {
@@ -73,7 +63,7 @@ async.series({
           }
         });
       }
-    }).add("gm-buffer-buffer", {
+    }).add('gm-buffer-buffer', {
       defer: true,
       fn: function(deferred) {
         gm(inputJpgBuffer).resize(width, height).quality(80).toBuffer(function (err, buffer) {
@@ -85,10 +75,10 @@ async.series({
           }
         });
       }
-    }).add("gm-file-file", {
+    }).add('gm-file-file', {
       defer: true,
       fn: function(deferred) {
-        gm(inputJpg).resize(width, height).quality(80).write(outputJpg, function (err) {
+        gm(fixtures.inputJpg).resize(width, height).quality(80).write(fixtures.outputJpg, function (err) {
           if (err) {
             throw err;
           } else {
@@ -96,10 +86,10 @@ async.series({
           }
         });
       }
-    }).add("gm-file-buffer", {
+    }).add('gm-file-buffer', {
       defer: true,
       fn: function(deferred) {
-        gm(inputJpg).resize(width, height).quality(80).toBuffer(function (err, buffer) {
+        gm(fixtures.inputJpg).resize(width, height).quality(80).toBuffer(function (err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -108,10 +98,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-buffer-file", {
+    }).add('sharp-buffer-file', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpgBuffer).resize(width, height).toFile(outputJpg, function(err) {
+        sharp(inputJpgBuffer).resize(width, height).toFile(fixtures.outputJpg, function(err) {
           if (err) {
             throw err;
           } else {
@@ -119,7 +109,7 @@ async.series({
           }
         });
       }
-    }).add("sharp-buffer-buffer", {
+    }).add('sharp-buffer-buffer', {
       defer: true,
       fn: function(deferred) {
         sharp(inputJpgBuffer).resize(width, height).toBuffer(function(err, buffer) {
@@ -131,10 +121,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-file", {
+    }).add('sharp-file-file', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).toFile(outputJpg, function(err) {
+        sharp(fixtures.inputJpg).resize(width, height).toFile(fixtures.outputJpg, function(err) {
           if (err) {
             throw err;
           } else {
@@ -142,21 +132,21 @@ async.series({
           }
         });
       }
-    }).add("sharp-stream-stream", {
+    }).add('sharp-stream-stream', {
       defer: true,
       fn: function(deferred) {
-        var readable = fs.createReadStream(inputJpg);
+        var readable = fs.createReadStream(fixtures.inputJpg);
-        var writable = fs.createWriteStream(outputJpg);
+        var writable = fs.createWriteStream(fixtures.outputJpg);
         writable.on('finish', function() {
           deferred.resolve();
         });
         var pipeline = sharp().resize(width, height);
         readable.pipe(pipeline).pipe(writable);
       }
-    }).add("sharp-file-buffer", {
+    }).add('sharp-file-buffer', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).toBuffer(function(err, buffer) {
+        sharp(fixtures.inputJpg).resize(width, height).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -165,18 +155,18 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-promise", {
+    }).add('sharp-promise', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).toBuffer().then(function(buffer) {
+        sharp(inputJpgBuffer).resize(width, height).toBuffer().then(function(buffer) {
           assert.notStrictEqual(null, buffer);
           deferred.resolve();
         });
       }
-    }).add("sharp-file-buffer-sharpen", {
+    }).add('sharp-sharpen-mild', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).sharpen().toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).sharpen().toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -185,10 +175,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-bicubic", {
+    }).add('sharp-sharpen-radius', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).interpolateWith(sharp.interpolator.bicubic).toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).sharpen(3, 1, 3).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -197,10 +187,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-nohalo", {
+    }).add('sharp-blur-mild', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).interpolateWith(sharp.interpolator.nohalo).toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).blur().toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -209,10 +199,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-locallyBoundedBicubic", {
+    }).add('sharp-blur-radius', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).interpolateWith(sharp.interpolator.locallyBoundedBicubic).toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).blur(3).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -221,10 +211,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-vertexSplitQuadraticBasisSpline", {
+    }).add('sharp-nearest-neighbour', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).interpolateWith(sharp.interpolator.vertexSplitQuadraticBasisSpline).toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).interpolateWith(sharp.interpolator.nearest).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -233,10 +223,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-progressive", {
+    }).add('sharp-bicubic', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).progressive().toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).interpolateWith(sharp.interpolator.bicubic).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -245,10 +235,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-rotate", {
+    }).add('sharp-nohalo', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).rotate(90).resize(width, height).toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).interpolateWith(sharp.interpolator.nohalo).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -257,10 +247,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-sequentialRead", {
+    }).add('sharp-locallyBoundedBicubic', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputJpg).resize(width, height).sequentialRead().toBuffer(function(err, buffer) {
+        sharp(inputJpgBuffer).resize(width, height).interpolateWith(sharp.interpolator.locallyBoundedBicubic).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -269,20 +259,105 @@ async.series({
           }
         });
       }
-    }).on("cycle", function(event) {
+    }).add('sharp-vertexSplitQuadraticBasisSpline', {
-      console.log("jpeg " + String(event.target));
+      defer: true,
-    }).on("complete", function() {
+      fn: function(deferred) {
-      callback(null, this.filter("fastest").pluck("name"));
+        sharp(inputJpgBuffer).resize(width, height).interpolateWith(sharp.interpolator.vertexSplitQuadraticBasisSpline).toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-gamma', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).gamma().toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-greyscale', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).greyscale().toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-greyscale-gamma', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).gamma().greyscale().toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-progressive', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).progressive().toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-rotate', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).rotate(90).resize(width, height).toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).add('sharp-sequentialRead', {
+      defer: true,
+      fn: function(deferred) {
+        sharp(inputJpgBuffer).resize(width, height).sequentialRead().toBuffer(function(err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
+    }).on('cycle', function(event) {
+      console.log('jpeg ' + String(event.target));
+    }).on('complete', function() {
+      callback(null, this.filter('fastest').pluck('name'));
     }).run();
   },
   png: function(callback) {
-    var inputPngBuffer = fs.readFileSync(inputPng);
+    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: inputPng,
+          srcPath: fixtures.inputPng,
-          dstPath: outputPng,
+          dstPath: fixtures.outputPng,
           width: width,
           height: height
         }, function(err) {
@@ -293,7 +368,7 @@ async.series({
           }
         });
       }
-    }).add("imagemagick-native-buffer-buffer", {
+    }).add('imagemagick-native-buffer-buffer', {
       defer: true,
       fn: function(deferred) {
         imagemagickNative.convert({
@@ -304,10 +379,10 @@ async.series({
         });
         deferred.resolve();
       }
-    }).add("gm-file-file", {
+    }).add('gm-file-file', {
       defer: true,
       fn: function(deferred) {
-        gm(inputPng).resize(width, height).write(outputPng, function (err) {
+        gm(fixtures.inputPng).resize(width, height).write(fixtures.outputPng, function (err) {
           if (err) {
             throw err;
           } else {
@@ -315,10 +390,10 @@ async.series({
           }
         });
       }
-    }).add("gm-file-buffer", {
+    }).add('gm-file-buffer', {
       defer: true,
       fn: function(deferred) {
-        gm(inputPng).resize(width, height).quality(80).toBuffer(function (err, buffer) {
+        gm(fixtures.inputPng).resize(width, height).quality(80).toBuffer(function (err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -327,10 +402,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-buffer-file", {
+    }).add('sharp-buffer-file', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputPngBuffer).resize(width, height).toFile(outputPng, function(err) {
+        sharp(inputPngBuffer).resize(width, height).toFile(fixtures.outputPng, function(err) {
           if (err) {
             throw err;
           } else {
@@ -338,7 +413,7 @@ async.series({
           }
         });
       }
-    }).add("sharp-buffer-buffer", {
+    }).add('sharp-buffer-buffer', {
       defer: true,
       fn: function(deferred) {
         sharp(inputPngBuffer).resize(width, height).toBuffer(function(err, buffer) {
@@ -350,10 +425,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-file", {
+    }).add('sharp-file-file', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputPng).resize(width, height).toFile(outputPng, function(err) {
+        sharp(fixtures.inputPng).resize(width, height).toFile(fixtures.outputPng, function(err) {
           if (err) {
             throw err;
           } else {
@@ -361,10 +436,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer", {
+    }).add('sharp-file-buffer', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputPng).resize(width, height).toBuffer(function(err, buffer) {
+        sharp(fixtures.inputPng).resize(width, height).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -373,10 +448,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-sharpen", {
+    }).add('sharp-progressive', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputPng).resize(width, height).sharpen().toBuffer(function(err, buffer) {
+        sharp(inputPngBuffer).resize(width, height).progressive().toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -385,10 +460,12 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-progressive", {
+    });
+    if (semver.gte(sharp.libvipsVersion(), '7.41.0')) {
+      pngSuite.add('sharp-withoutAdaptiveFiltering', {
         defer: true,
         fn: function(deferred) {
-        sharp(inputPng).resize(width, height).progressive().toBuffer(function(err, buffer) {
+          sharp(inputPngBuffer).resize(width, height).withoutAdaptiveFiltering().toBuffer(function(err, buffer) {
             if (err) {
               throw err;
             } else {
@@ -397,18 +474,20 @@ async.series({
             }
           });
         }
-    }).on("cycle", function(event) {
+      });
-      console.log(" png " + String(event.target));
+    }
-    }).on("complete", function() {
+    pngSuite.on('cycle', function(event) {
-      callback(null, this.filter("fastest").pluck("name"));
+      console.log(' png ' + String(event.target));
+    }).on('complete', function() {
+      callback(null, this.filter('fastest').pluck('name'));
     }).run();
   },
   webp: function(callback) {
-    var inputWebpBuffer = fs.readFileSync(inputWebp);
+    var inputWebPBuffer = fs.readFileSync(fixtures.inputWebP);
-    (new Benchmark.Suite("webp")).add("sharp-buffer-file", {
+    (new Benchmark.Suite('webp')).add('sharp-buffer-file', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputWebpBuffer).resize(width, height).toFile(outputWebp, function(err) {
+        sharp(inputWebPBuffer).resize(width, height).toFile(fixtures.outputWebP, function(err) {
           if (err) {
             throw err;
           } else {
@@ -416,10 +495,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-buffer-buffer", {
+    }).add('sharp-buffer-buffer', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputWebpBuffer).resize(width, height).toBuffer(function(err, buffer) {
+        sharp(inputWebPBuffer).resize(width, height).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -428,10 +507,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-file", {
+    }).add('sharp-file-file', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputWebp).resize(width, height).toFile(outputWebp, function(err) {
+        sharp(fixtures.inputWebP).resize(width, height).toFile(fixtures.outputWebP, function(err) {
           if (err) {
             throw err;
           } else {
@@ -439,10 +518,10 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer", {
+    }).add('sharp-file-buffer', {
       defer: true,
       fn: function(deferred) {
-        sharp(inputWebp).resize(width, height).toBuffer(function(err, buffer) {
+        sharp(fixtures.inputWebp).resize(width, height).toBuffer(function(err, buffer) {
           if (err) {
             throw err;
           } else {
@@ -451,98 +530,17 @@ async.series({
           }
         });
       }
-    }).add("sharp-file-buffer-sharpen", {
+    }).on('cycle', function(event) {
-      defer: true,
+      console.log('webp ' + String(event.target));
-      fn: function(deferred) {
+    }).on('complete', function() {
-        sharp(inputWebp).resize(width, height).sharpen().toBuffer(function(err, buffer) {
+      callback(null, this.filter('fastest').pluck('name'));
-          if (err) {
-            throw err;
-          } else {
-            assert.notStrictEqual(null, buffer);
-            deferred.resolve();
-          }
-        });
-      }
-    }).on("cycle", function(event) {
-      console.log("webp " + String(event.target));
-    }).on("complete", function() {
-      callback(null, this.filter("fastest").pluck("name"));
-    }).run();
-  },
-  tiff: function(callback) {
-    (new Benchmark.Suite("tiff")).add("sharp-file-file", {
-      defer: true,
-      fn: function(deferred) {
-        sharp(inputTiff).resize(width, height).toFile(outputTiff, function(err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
-      }
-    }).add("sharp-file-file-sharpen", {
-      defer: true,
-      fn: function(deferred) {
-        sharp(inputTiff).resize(width, height).sharpen().toFile(outputTiff, function(err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
-      }
-    }).on("cycle", function(event) {
-      console.log("tiff " + String(event.target));
-    }).on("complete", function() {
-      callback(null, this.filter("fastest").pluck("name"));
-    }).run();
-  },
-  gif: function(callback) {
-    (new Benchmark.Suite("gif")).add("sharp-file-file", {
-      defer: true,
-      fn: function(deferred) {
-        sharp(inputGif).resize(width, height).toFile(outputTiff, function(err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
-      }
-    }).add("sharp-file-file-sharpen", {
-      defer: true,
-      fn: function(deferred) {
-        sharp(inputGif).resize(width, height).sharpen().toFile(outputTiff, function(err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
-      }
-    }).add("sharp-file-file-sequentialRead", {
-      defer: true,
-      fn: function(deferred) {
-        sharp(inputGif).sequentialRead().resize(width, height).toFile(outputTiff, function(err) {
-          if (err) {
-            throw err;
-          } else {
-            deferred.resolve();
-          }
-        });
-      }
-    }).on("cycle", function(event) {
-      console.log("gif " + String(event.target));
-    }).on("complete", function() {
-      callback(null, this.filter("fastest").pluck("name"));
     }).run();
   }
 }, function(err, results) {
   assert(!err, err);
   Object.keys(results).forEach(function(format) {
-    if (results[format].toString().substr(0, 5) !== "sharp") {
+    if (results[format].toString().substr(0, 5) !== 'sharp') {
-      console.log("sharp was slower than " + results[format] + " for " + format);
+      console.log('sharp was slower than ' + results[format] + ' for ' + format);
     }
   });
   console.dir(sharp.cache());

test/bench/random.js

@@ -0,0 +1,65 @@
+'use strict';
+
+var imagemagick = require('imagemagick');
+var gm = require('gm');
+var assert = require('assert');
+var Benchmark = require('benchmark');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+var min = 320;
+var max = 960;
+
+var randomDimension = function() {
+  return Math.random() * (max - min) + min;
+};
+
+new Benchmark.Suite('random').add('imagemagick', {
+  defer: true,
+  fn: function(deferred) {
+    imagemagick.resize({
+      srcPath: fixtures.inputJpg,
+      dstPath: fixtures.outputJpg,
+      quality: 0.8,
+      width: randomDimension(),
+      height: randomDimension()
+    }, function(err) {
+      if (err) {
+        throw err;
+      } else {
+        deferred.resolve();
+      }
+    });
+  }
+}).add('gm', {
+  defer: true,
+  fn: function(deferred) {
+    gm(fixtures.inputJpg).resize(randomDimension(), randomDimension()).quality(80).toBuffer(function (err, buffer) {
+      if (err) {
+        throw err;
+      } else {
+        assert.notStrictEqual(null, buffer);
+        deferred.resolve();
+      }
+    });
+  }
+}).add('sharp', {
+  defer: true,
+  fn: function(deferred) {
+    sharp(fixtures.inputJpg).resize(randomDimension(), randomDimension()).toBuffer(function(err, buffer) {
+      if (err) {
+        throw err;
+      } else {
+        assert.notStrictEqual(null, buffer);
+        deferred.resolve();
+      }
+    });
+  }
+}).on('cycle', function(event) {
+  console.log(String(event.target));
+}).on('complete', function() {
+  var winner = this.filter('fastest').pluck('name');
+  assert.strictEqual('sharp', String(winner), 'sharp was slower than ' + winner);
+  console.dir(sharp.cache());
+}).run();

test/fixtures/index.js

@@ -0,0 +1,32 @@
+'use strict';
+
+var path = require('path');
+
+var getPath = function(filename) {
+  return path.join(__dirname, filename);
+};
+
+module.exports = {
+
+  inputJpg: getPath('2569067123_aca715a2ee_o.jpg'), // http://www.flickr.com/photos/grizdave/2569067123/
+  inputJpgWithExif: getPath('Landscape_8.jpg'), // https://github.com/recurser/exif-orientation-examples/blob/master/Landscape_8.jpg
+  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'),
+
+  inputPng: getPath('50020484-00001.png'), // http://c.searspartsdirect.com/lis_png/PLDM/50020484-00001.png
+  inputPngWithTransparency: getPath('blackbug.png'), // public domain
+
+  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
+
+  outputJpg: getPath('output.jpg'),
+  outputPng: getPath('output.png'),
+  outputWebP: getPath('output.webp'),
+  outputZoinks: getPath('output.zoinks'), // an 'unknown' file extension
+
+  path: getPath // allows tests to write files to fixtures directory (for testing with human eyes)
+
+};

test/leak/leak.sh

@@ -0,0 +1,8 @@
+if ! type valgrind >/dev/null; then
+  echo "Please install valgrind before running memory leak tests"
+  exit 1
+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 --trace-children=yes npm test

test/leak/sharp.supp

@@ -0,0 +1,111 @@
+# libjpeg warnings
+{
+  cond_jpeg_read_scanlines
+  Memcheck:Cond
+  ...
+  fun:jpeg_read_scanlines
+}
+{
+  value_jpeg_read_scanlines
+  Memcheck:Value8
+  ...
+  fun:jpeg_read_scanlines
+}
+{
+  cond_jpeg_write_scanlines
+  Memcheck:Cond
+  ...
+  fun:jpeg_write_scanlines
+}
+{
+  cond_jpeg_finish_compress
+  Memcheck:Cond
+  ...
+  fun:jpeg_finish_compress
+}
+{
+  value_jpeg_finish_compress
+  Memcheck:Value8
+  ...
+  fun:jpeg_finish_compress
+}
+
+# libvips interpolator warnings
+{
+  cond_libvips_interpolate_lbb
+  Memcheck:Cond
+  ...
+  fun:_ZL32vips_interpolate_lbb_interpolateP16_VipsInterpolatePvP11_VipsRegiondd
+  fun:vips_affine_gen
+}
+
+# libuv warnings
+{
+  free_libuv
+  Memcheck:Free
+  ...
+  fun:uv__work_done
+}
+
+# nodejs warnings
+{
+  param_nodejs_write_buffer
+  Memcheck:Param
+  write(buf)
+  ...
+  obj:/usr/bin/nodejs
+}
+{
+  leak_nodejs_ImmutableAsciiSource_CreateFromLiteral
+  Memcheck:Leak
+  match-leak-kinds: definite
+  ...
+  fun:_ZN4node20ImmutableAsciiSource17CreateFromLiteralEPKcm
+}
+{
+  leak_nodejs_Buffer_New
+  Memcheck:Leak
+  match-leak-kinds: definite
+  ...
+  fun:_ZN4node6Buffer3NewERKN2v89ArgumentsE
+}
+{
+  leak_nodejs_Buffer_Replace
+   Memcheck:Leak
+   match-leak-kinds: indirect,possible
+   ...
+   fun:_ZN4node6Buffer7ReplaceEPcmPFvS1_PvES2_
+}
+{
+  leak_nodejs_SignalWrap_New
+  Memcheck:Leak
+  match-leak-kinds: possible
+  ...
+  fun:_ZN4node10SignalWrap3NewERKN2v89ArgumentsE
+}
+{
+  leak_nodejs_TTYWrap_New
+  Memcheck:Leak
+  match-leak-kinds: possible
+  ...
+  fun:_ZN4node7TTYWrap3NewERKN2v89ArgumentsE
+}
+{
+  leak_nodejs_ares_init_options
+  Memcheck:Leak
+  match-leak-kinds: reachable
+  fun:malloc
+  fun:strdup
+  ...
+  fun:ares_init_options
+}
+
+# vips__init warnings
+{
+  leak_libvips_init
+  Memcheck:Leak
+  match-leak-kinds: reachable
+  fun:malloc
+  ...
+  fun:vips__init
+}

test/unit/alpha.js

@@ -0,0 +1,64 @@
+'use strict';
+
+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) {
+    sharp(fixtures.inputPngWithTransparency)
+      .flatten()
+      .resize(400, 300)
+      .toFile(fixtures.path('output.flatten-black.jpg'), done);
+  });
+
+  it('Flatten to RGB orange', function(done) {
+    sharp(fixtures.inputPngWithTransparency)
+      .flatten()
+      .background({r: 255, g: 102, b: 0})
+      .resize(400, 300)
+      .toFile(fixtures.path('output.flatten-rgb-orange.jpg'), done);
+  });
+
+  it('Flatten to CSS/hex orange', function(done) {
+    sharp(fixtures.inputPngWithTransparency)
+      .flatten()
+      .background('#ff6600')
+      .resize(400, 300)
+      .toFile(fixtures.path('output.flatten-hex-orange.jpg'), done);
+  });
+
+  it('Do not flatten', function(done) {
+    sharp(fixtures.inputPngWithTransparency)
+      .flatten(false)
+      .toBuffer(function(err, data) {
+        if (err) throw err;
+        sharp(data).metadata(function(err, metadata) {
+          if (err) throw err;
+          assert.strictEqual('png', metadata.format);
+          assert.strictEqual(4, metadata.channels);
+          done();
+        });
+      });
+  });
+
+  it('Ignored for JPEG', function(done) {
+    sharp(fixtures.inputJpg)
+      .background('#ff0000')
+      .flatten()
+      .toBuffer(function(err, data) {
+        if (err) throw err;
+        sharp(data).metadata(function(err, metadata) {
+          if (err) throw err;
+          assert.strictEqual('jpeg', metadata.format);
+          assert.strictEqual(3, metadata.channels);
+          done();
+        });
+      });
+  });
+
+});

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 100', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .blur(100)
+      .toFile(fixtures.path('output.blur-100.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(1.5);
+    } 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();
+          });
+      });
+  });
+
+});

test/unit/colourspace.js

@@ -0,0 +1,83 @@
+'use strict';
+
+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) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .greyscale()
+      .toFile(fixtures.path('output.greyscale-gamma-0.0.jpg'), done);
+  });
+
+  it('To greyscale with gamma correction', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .gamma()
+      .greyscale()
+      .toFile(fixtures.path('output.greyscale-gamma-2.2.jpg'), done);
+  });
+
+  it('Not to greyscale', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .greyscale(false)
+      .toFile(fixtures.path('output.greyscale-not.jpg'), done);
+  });
+
+  it('From 1-bit TIFF to sRGB WebP [slow]', function(done) {
+    sharp(fixtures.inputTiff)
+      .webp()
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('webp', info.format);
+        done();
+      });
+  });
+
+  it('From CMYK to sRGB', function(done) {
+    sharp(fixtures.inputJpgWithCmykProfile)
+      .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();
+      });
+  });
+
+  it('From CMYK to sRGB with white background, not yellow', function(done) {
+    sharp(fixtures.inputJpgWithCmykProfile)
+      .resize(320, 240)
+      .background('white')
+      .embed()
+      .toFile(fixtures.path('output.cmyk2srgb.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('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();
+      });
+  });
+
+});

test/unit/crop.js

@@ -0,0 +1,95 @@
+'use strict';
+
+var assert = require('assert');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+sharp.cache(0);
+
+describe('Crop gravities', function() {
+
+  it('North', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 80)
+      .crop(sharp.gravity.north)
+      .toFile(fixtures.path('output.gravity-north.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        done();
+      });
+  });
+
+  it('East', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(80, 320)
+      .crop(sharp.gravity.east)
+      .toFile(fixtures.path('output.gravity-east.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(80, info.width);
+        assert.strictEqual(320, info.height);
+        done();
+      });
+  });
+
+  it('South', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 80)
+      .crop(sharp.gravity.south)
+      .toFile(fixtures.path('output.gravity-south.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        done();
+      });
+  });
+
+  it('West', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(80, 320)
+      .crop(sharp.gravity.west)
+      .toFile(fixtures.path('output.gravity-west.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(80, info.width);
+        assert.strictEqual(320, info.height);
+        done();
+      });
+  });
+
+  it('Center', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 80)
+      .crop(sharp.gravity.center)
+      .toFile(fixtures.path('output.gravity-center.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        done();
+      });
+  });
+
+  it('Centre', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(80, 320)
+      .crop(sharp.gravity.centre)
+      .toFile(fixtures.path('output.gravity-centre.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(80, info.width);
+        assert.strictEqual(320, info.height);
+        done();
+      });
+  });
+
+  it('Invalid', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).crop(5);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+});

test/unit/embed.js

@@ -0,0 +1,51 @@
+'use strict';
+
+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) {
+    sharp(fixtures.inputJpg)
+      .embed()
+      .resize(320, 240)
+      .png()
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('png', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        sharp(data).metadata(function(err, metadata) {
+          if (err) throw err;
+          assert.strictEqual(3, metadata.channels);
+          done();
+        });
+      });
+  });
+
+  it('JPEG within WebP, to include alpha channel', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .background({r: 0, g: 0, b: 0, a: 0})
+      .embed()
+      .webp()
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('webp', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        sharp(data).metadata(function(err, metadata) {
+          if (err) throw err;
+          assert.strictEqual(4, metadata.channels);
+          done();
+        });
+      });
+  });
+
+});

test/unit/extract.js

@@ -0,0 +1,95 @@
+'use strict';
+
+var assert = require('assert');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+sharp.cache(0);
+
+describe('Partial image extraction', function() {
+
+  it('JPEG', function(done) {
+    sharp(fixtures.inputJpg)
+      .extract(2, 2, 20, 20)
+      .toFile(fixtures.path('output.extract.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(20, info.width);
+        assert.strictEqual(20, info.height);
+        done();
+      });
+  });
+
+  it('PNG', function(done) {
+    sharp(fixtures.inputPng)
+      .extract(300, 200, 400, 200)
+      .toFile(fixtures.path('output.extract.png'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(400, info.width);
+        assert.strictEqual(200, info.height);
+        done();
+      });
+  });
+
+  it('WebP', function(done) {
+    sharp(fixtures.inputWebP)
+      .extract(50, 100, 125, 200)
+      .toFile(fixtures.path('output.extract.webp'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(125, info.width);
+        assert.strictEqual(200, info.height);
+        done();
+      });
+  });
+
+  it('TIFF', function(done) {
+    sharp(fixtures.inputTiff)
+      .extract(63, 34, 341, 529)
+      .toFile(fixtures.path('output.extract.tiff'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(341, info.width);
+        assert.strictEqual(529, info.height);
+        done();
+      });
+  });
+
+  it('Before resize', function(done) {
+    sharp(fixtures.inputJpg)
+      .extract(10, 10, 10, 500, 500)
+      .resize(100, 100)
+      .toFile(fixtures.path('output.extract.resize.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(100, info.width);
+        assert.strictEqual(100, info.height);
+        done();
+      });
+  });
+
+  it('After resize and crop', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(500, 500)
+      .crop(sharp.gravity.north)
+      .extract(10, 10, 100, 100)
+      .toFile(fixtures.path('output.resize.crop.extract.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(100, info.width);
+        assert.strictEqual(100, info.height);
+        done();
+      });
+  });
+
+  it('Before and after resize and crop', function(done) {
+    sharp(fixtures.inputJpg)
+      .extract(0, 0, 700, 700)
+      .resize(500, 500)
+      .crop(sharp.gravity.north)
+      .extract(10, 10, 100, 100)
+      .toFile(fixtures.path('output.extract.resize.crop.extract.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual(100, info.width);
+        assert.strictEqual(100, info.height);
+        done();
+      });
+  });
+
+});

test/unit/gamma.js

@@ -0,0 +1,43 @@
+'use strict';
+
+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) {
+    sharp(fixtures.inputJpgWithGammaHoliness)
+      .resize(129, 111)
+      .toFile(fixtures.path('output.gamma-0.0.jpg'), done);
+  });
+
+  it('value of 2.2 (default)', function(done) {
+    sharp(fixtures.inputJpgWithGammaHoliness)
+      .resize(129, 111)
+      .gamma()
+      .toFile(fixtures.path('output.gamma-2.2.jpg'), done);
+  });
+
+  it('value of 3.0', function(done) {
+    sharp(fixtures.inputJpgWithGammaHoliness)
+      .resize(129, 111)
+      .gamma(3)
+      .toFile(fixtures.path('output.gamma-3.0.jpg'), done);
+  });
+
+  it('invalid value', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpgWithGammaHoliness).gamma(4);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+});

test/unit/interpolation.js

@@ -0,0 +1,96 @@
+'use strict';
+
+var assert = require('assert');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+sharp.cache(0);
+
+describe('Interpolation', function() {
+
+  it('nearest neighbour', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .interpolateWith(sharp.interpolator.nearest)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+  it('bilinear', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .interpolateWith(sharp.interpolator.bilinear)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+  it('bicubic', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .interpolateWith(sharp.interpolator.bicubic)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+  it('nohalo', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .interpolateWith(sharp.interpolator.nohalo)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+  it('locally bounded bicubic (LBB)', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .interpolateWith(sharp.interpolator.locallyBoundedBicubic)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+  it('vertex split quadratic basis spline (VSQBS)', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .interpolateWith(sharp.interpolator.vertexSplitQuadraticBasisSpline)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+});

test/unit/io.js

@@ -0,0 +1,420 @@
+'use strict';
+
+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) {
+    var writable = fs.createWriteStream(fixtures.outputJpg);
+    writable.on('finish', function() {
+      sharp(fixtures.outputJpg).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(240, info.height);
+        fs.unlinkSync(fixtures.outputJpg);
+        done();
+      });
+    });
+    sharp(fixtures.inputJpg).resize(320, 240).pipe(writable);
+  });
+
+  it('Read from Buffer and write to Stream', function(done) {
+    var inputJpgBuffer = fs.readFileSync(fixtures.inputJpg);
+    var writable = fs.createWriteStream(fixtures.outputJpg);
+    writable.on('finish', function() {
+      sharp(fixtures.outputJpg).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(240, info.height);
+        fs.unlinkSync(fixtures.outputJpg);
+        done();
+      });
+    });
+    sharp(inputJpgBuffer).resize(320, 240).pipe(writable);
+  });
+
+  it('Read from Stream and write to File', function(done) {
+    var readable = fs.createReadStream(fixtures.inputJpg);
+    var pipeline = sharp().resize(320, 240).toFile(fixtures.outputJpg, function(err, info) {
+      if (err) throw err;
+      assert.strictEqual('jpeg', info.format);
+      assert.strictEqual(320, info.width);
+      assert.strictEqual(240, info.height);
+      fs.unlinkSync(fixtures.outputJpg);
+      done();
+    });
+    readable.pipe(pipeline);
+  });
+
+  it('Read from Stream and write to Buffer', function(done) {
+    var readable = fs.createReadStream(fixtures.inputJpg);
+    var pipeline = sharp().resize(320, 240).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(240, info.height);
+      done();
+    });
+    readable.pipe(pipeline);
+  });
+
+  it('Read from Stream and write to Buffer via Promise', function(done) {
+    var readable = fs.createReadStream(fixtures.inputJpg);
+    var pipeline = sharp().resize(1, 1);
+    pipeline.toBuffer().then(function(data) {
+      assert.strictEqual(true, data.length > 0);
+      done();
+    }).catch(function(err) {
+      throw err;
+    });
+    readable.pipe(pipeline);
+  });
+
+  it('Read from Stream and write to Stream', function(done) {
+    var readable = fs.createReadStream(fixtures.inputJpg);
+    var writable = fs.createWriteStream(fixtures.outputJpg);
+    writable.on('finish', function() {
+      sharp(fixtures.outputJpg).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(240, info.height);
+        fs.unlinkSync(fixtures.outputJpg);
+        done();
+      });
+    });
+    var pipeline = sharp().resize(320, 240);
+    readable.pipe(pipeline).pipe(writable);
+  });
+
+  it('Handle Stream to Stream error ', function(done) {
+    var pipeline = sharp().resize(320, 240);
+    var anErrorWasEmitted = false;
+    pipeline.on('error', function(err) {
+      anErrorWasEmitted = !!err;
+    }).on('end', function() {
+      assert(anErrorWasEmitted);
+      fs.unlinkSync(fixtures.outputJpg);
+      done();
+    });
+    var readableButNotAnImage = fs.createReadStream(__filename);
+    var writable = fs.createWriteStream(fixtures.outputJpg);
+    readableButNotAnImage.pipe(pipeline).pipe(writable);
+  });
+
+  it('Handle File to Stream error', function(done) {
+    var readableButNotAnImage = sharp(__filename).resize(320, 240);
+    var anErrorWasEmitted = false;
+    readableButNotAnImage.on('error', function(err) {
+      anErrorWasEmitted = !!err;
+    }).on('end', function() {
+      assert(anErrorWasEmitted);
+      fs.unlinkSync(fixtures.outputJpg);
+      done();
+    });
+    var writable = fs.createWriteStream(fixtures.outputJpg);
+    readableButNotAnImage.pipe(writable);
+  });
+
+  it('Sequential read', function(done) {
+    sharp(fixtures.inputJpg)
+      .sequentialRead()
+      .resize(320, 240)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+  it('Not sequential read', function(done) {
+    sharp(fixtures.inputJpg)
+      .sequentialRead(false)
+      .resize(320, 240)
+      .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(240, info.height);
+        done();
+      });
+  });
+
+  it('Fail when output File is input File', function(done) {
+    sharp(fixtures.inputJpg).toFile(fixtures.inputJpg, function(err) {
+      assert(!!err);
+      done();
+    });
+  });
+
+  it('Fail when output File is input File via Promise', function(done) {
+    sharp(fixtures.inputJpg).toFile(fixtures.inputJpg).then(function(data) {
+      assert(false);
+      done();
+    }).catch(function(err) {
+      assert(!!err);
+      done();
+    });
+  });
+
+  it('Fail when output File is empty', function(done) {
+    sharp(fixtures.inputJpg).toFile('', function(err) {
+      assert(!!err);
+      done();
+    });
+  });
+
+  it('Fail when output File is empty via Promise', function(done) {
+    sharp(fixtures.inputJpg).toFile('').then(function(data) {
+      assert(false);
+      done();
+    }).catch(function(err) {
+      assert(!!err);
+      done();
+    });
+  });
+
+  it('Fail when input is empty Buffer', function(done) {
+    var failed = true;
+    try {
+      sharp(new Buffer(0));
+      failed = false;
+    } catch (err) {
+      assert(err instanceof Error);
+    }
+    assert(failed);
+    done();
+  });
+
+  it('Fail when input is invalid Buffer', function(done) {
+    var failed = true;
+    try {
+      sharp(new Buffer([0x1, 0x2, 0x3, 0x4]));
+      failed = false;
+    } catch (err) {
+      assert(err instanceof Error);
+    }
+    assert(failed);
+    done();
+  });
+
+  it('Promises/A+', function(done) {
+    sharp(fixtures.inputJpg).resize(320, 240).toBuffer().then(function(data) {
+      sharp(data).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(240, info.height);
+        done();
+      });
+    }).catch(function(err) {
+      throw err;
+    });
+  });
+
+  it('JPEG quality', function(done) {
+    sharp(fixtures.inputJpg).resize(320, 240).quality(70).toBuffer(function(err, buffer70) {
+      if (err) throw err;
+      sharp(fixtures.inputJpg).resize(320, 240).toBuffer(function(err, buffer80) {
+        if (err) throw err;
+        sharp(fixtures.inputJpg).resize(320, 240).quality(90).toBuffer(function(err, buffer90) {
+          if (err) throw err;
+          assert(buffer70.length < buffer80.length);
+          assert(buffer80.length < buffer90.length);
+          done();
+        });
+      });
+    });
+  });
+
+  it('Invalid quality', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).quality(-1);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('Progressive image', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320, 240)
+      .png()
+      .progressive(false)
+      .toBuffer(function(err, nonProgressive, info) {
+        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)
+          .progressive()
+          .toBuffer(function(err, progressive, info) {
+            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);
+            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('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        fs.unlinkSync(fixtures.outputZoinks);
+        done();
+      });
+    });
+
+    it('PNG', function(done) {
+      sharp(fixtures.inputPng).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('png', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        fs.unlinkSync(fixtures.outputZoinks);
+        done();
+      });
+    });
+
+    it('Transparent PNG', function(done) {
+      sharp(fixtures.inputPngWithTransparency).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('png', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        done();
+      });
+    });
+
+    it('WebP', function(done) {
+      sharp(fixtures.inputWebP).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('webp', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        fs.unlinkSync(fixtures.outputZoinks);
+        done();
+      });
+    });
+
+    it('TIFF', function(done) {
+      sharp(fixtures.inputTiff).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('tiff', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(80, info.height);
+        fs.unlinkSync(fixtures.outputZoinks);
+        done();
+      });
+    });
+
+    it('Fail with GIF', function(done) {
+      sharp(fixtures.inputGif).resize(320, 80).toFile(fixtures.outputZoinks, function(err) {
+        assert(!!err);
+        done();
+      });
+    });
+
+  });
+
+  describe('PNG output', function() {
+
+    it('compression level is valid', function(done) {
+      var isValid = false;
+      try {
+        sharp().compressionLevel(0);
+        isValid = true;
+      } catch (e) {}
+      assert(isValid);
+      done();
+    });
+
+    it('compression level is invalid', function(done) {
+      var isValid = false;
+      try {
+        sharp().compressionLevel(-1);
+        isValid = true;
+      } catch (e) {}
+      assert(!isValid);
+      done();
+    });
+
+    if (semver.gte(sharp.libvipsVersion(), '7.41.0')) {
+      it('withoutAdaptiveFiltering generates smaller file [libvips 7.41.0+]', function(done) {
+        // First generate with adaptive filtering
+        sharp(fixtures.inputPng)
+          .resize(320, 240)
+          .withoutAdaptiveFiltering(false)
+          .toBuffer(function(err, dataAdaptive, info) {
+            if (err) throw err;
+            assert.strictEqual(true, dataAdaptive.length > 0);
+            assert.strictEqual('png', info.format);
+            assert.strictEqual(320, info.width);
+            assert.strictEqual(240, info.height);
+            // Then generate without
+            sharp(fixtures.inputPng)
+              .resize(320, 240)
+              .withoutAdaptiveFiltering()
+              .toBuffer(function(err, dataWithoutAdaptive, info) {
+                if (err) throw err;
+                assert.strictEqual(true, dataWithoutAdaptive.length > 0);
+                assert.strictEqual('png', info.format);
+                assert.strictEqual(320, info.width);
+                assert.strictEqual(240, info.height);
+                assert.strictEqual(true, dataWithoutAdaptive.length < dataAdaptive.length);
+                done();
+              });
+          });
+      });
+    }
+
+  });
+
+  if (semver.gte(sharp.libvipsVersion(), '7.40.0')) {
+    it('Load TIFF from Buffer [libvips 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('jpeg', info.format);
+          assert.strictEqual(320, info.width);
+          assert.strictEqual(240, info.height);
+          done();
+        });
+    });
+  }
+
+});

test/unit/jshint.js

@@ -0,0 +1 @@
+require('mocha-jshint')();

test/unit/metadata.js

@@ -0,0 +1,190 @@
+'use strict';
+
+var fs = require('fs');
+var assert = require('assert');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+sharp.cache(0);
+
+describe('Image metadata', function() {
+
+  it('JPEG', function(done) {
+    sharp(fixtures.inputJpg).metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('jpeg', metadata.format);
+      assert.strictEqual(2725, metadata.width);
+      assert.strictEqual(2225, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual('undefined', typeof metadata.orientation);
+      done();
+    });
+  });
+
+  it('JPEG with EXIF', function(done) {
+    sharp(fixtures.inputJpgWithExif).metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('jpeg', metadata.format);
+      assert.strictEqual(450, metadata.width);
+      assert.strictEqual(600, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      assert.strictEqual(8, metadata.orientation);
+      done();
+    });
+  });
+
+  it('TIFF', function(done) {
+    sharp(fixtures.inputTiff).metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('tiff', metadata.format);
+      assert.strictEqual(2464, metadata.width);
+      assert.strictEqual(3248, metadata.height);
+      assert.strictEqual('b-w', metadata.space);
+      assert.strictEqual(1, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      done();
+    });
+  });
+
+  it('PNG', function(done) {
+    sharp(fixtures.inputPng).metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('png', metadata.format);
+      assert.strictEqual(2809, metadata.width);
+      assert.strictEqual(2074, metadata.height);
+      assert.strictEqual('b-w', metadata.space);
+      assert.strictEqual(1, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      done();
+    });
+  });
+
+  it('Transparent PNG', function(done) {
+    sharp(fixtures.inputPngWithTransparency).metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('png', metadata.format);
+      assert.strictEqual(2048, metadata.width);
+      assert.strictEqual(1536, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(4, metadata.channels);
+      assert.strictEqual(true, metadata.hasAlpha);
+      done();
+    });
+  });
+
+  it('WebP', function(done) {
+    sharp(fixtures.inputWebP).metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('webp', metadata.format);
+      assert.strictEqual(1024, metadata.width);
+      assert.strictEqual(772, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      done();
+    });
+  });
+
+  it('GIF via libmagick', function(done) {
+    sharp(fixtures.inputGif).metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('magick', metadata.format);
+      assert.strictEqual(800, metadata.width);
+      assert.strictEqual(533, metadata.height);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      done();
+    });
+  });
+
+  it('File in, Promise out', function(done) {
+    sharp(fixtures.inputJpg).metadata().then(function(metadata) {
+      assert.strictEqual('jpeg', metadata.format);
+      assert.strictEqual(2725, metadata.width);
+      assert.strictEqual(2225, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      done();
+    });
+  });
+
+  it('Stream in, Promise out', function(done) {
+    var readable = fs.createReadStream(fixtures.inputJpg);
+    var pipeline = sharp();
+    pipeline.metadata().then(function(metadata) {
+      assert.strictEqual('jpeg', metadata.format);
+      assert.strictEqual(2725, metadata.width);
+      assert.strictEqual(2225, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      done();
+    }).catch(function(err) {
+      throw err;
+    });
+    readable.pipe(pipeline);
+  });
+
+  it('Stream', function(done) {
+    var readable = fs.createReadStream(fixtures.inputJpg);
+    var pipeline = sharp().metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('jpeg', metadata.format);
+      assert.strictEqual(2725, metadata.width);
+      assert.strictEqual(2225, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      done();
+    });
+    readable.pipe(pipeline);
+  });
+
+  it('Resize to half width using metadata', function(done) {
+    var image = sharp(fixtures.inputJpg);
+    image.metadata(function(err, metadata) {
+      if (err) throw err;
+      assert.strictEqual('jpeg', metadata.format);
+      assert.strictEqual(2725, metadata.width);
+      assert.strictEqual(2225, metadata.height);
+      assert.strictEqual('srgb', metadata.space);
+      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(false, metadata.hasAlpha);
+      image.resize(metadata.width / 2).toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(1362, info.width);
+        assert.strictEqual(1112, info.height);
+        done();
+      });
+    });
+  });
+
+  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) {
+        if (err) throw err;
+        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) {
+        if (err) throw err;
+        assert.strictEqual('undefined', typeof metadata.orientation);
+        done();
+      });
+    });
+  });
+
+});

test/unit/resize.js

@@ -0,0 +1,186 @@
+'use strict';
+
+var assert = require('assert');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+sharp.cache(0);
+
+describe('Resize dimensions', function() {
+
+  it('Exact crop', function(done) {
+    sharp(fixtures.inputJpg).resize(320, 240).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(240, info.height);
+      done();
+    });
+  });
+
+  it('Fixed width', function(done) {
+    sharp(fixtures.inputJpg).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);
+      assert.strictEqual(261, info.height);
+      done();
+    });
+  });
+
+  it('Fixed height', function(done) {
+    sharp(fixtures.inputJpg).resize(null, 320).toBuffer(function(err, data, info) {
+      if (err) throw err;
+      assert.strictEqual(true, data.length > 0);
+      assert.strictEqual('jpeg', info.format);
+      assert.strictEqual(391, info.width);
+      assert.strictEqual(320, info.height);
+      done();
+    });
+  });
+
+  it('Identity transform', function(done) {
+    sharp(fixtures.inputJpg).toBuffer(function(err, data, info) {
+      if (err) throw err;
+      assert.strictEqual(true, data.length > 0);
+      assert.strictEqual('jpeg', info.format);
+      assert.strictEqual(2725, info.width);
+      assert.strictEqual(2225, info.height);
+      done();
+    });
+  });
+
+  it('Upscale', function(done) {
+    sharp(fixtures.inputJpg).resize(3000).toBuffer(function(err, data, info) {
+      if (err) throw err;
+      assert.strictEqual(true, data.length > 0);
+      assert.strictEqual('jpeg', info.format);
+      assert.strictEqual(3000, info.width);
+      assert.strictEqual(2449, info.height);
+      done();
+    });
+  });
+
+  it('Invalid width', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).resize('spoons', 240);
+    } catch (err) {
+      isValid = false;
+    }
+    assert.strictEqual(false, isValid);
+    done();
+  });
+
+  it('Invalid height', function(done) {
+    var isValid = true;
+    try {
+      sharp(fixtures.inputJpg).resize(320, 'spoons');
+    } 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;
+      assert.strictEqual(true, data.length > 0);
+      assert.strictEqual('jpeg', info.format);
+      assert.strictEqual(240, info.width);
+      assert.strictEqual(320, info.height);
+      done();
+    });
+  });
+
+  it('TIFF known to cause rounding errors', function(done) {
+    sharp(fixtures.inputTiff).resize(240, 320).jpeg().toBuffer(function(err, data, info) {
+      if (err) throw err;
+      assert.strictEqual(true, data.length > 0);
+      assert.strictEqual('jpeg', info.format);
+      assert.strictEqual(240, info.width);
+      assert.strictEqual(320, info.height);
+      done();
+    });
+  });
+
+  it('Max width or height considering ratio (landscape)', function(done) {
+    sharp(fixtures.inputJpg).resize(320, 320).max().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(261, info.height);
+      done();
+    });
+  });
+
+  it('Max width or height considering ratio (portrait)', function(done) {
+    sharp(fixtures.inputTiff).resize(320, 320).max().jpeg().toBuffer(function(err, data, info) {
+      if (err) throw err;
+      assert.strictEqual(true, data.length > 0);
+      assert.strictEqual('jpeg', info.format);
+      assert.strictEqual(243, info.width);
+      assert.strictEqual(320, info.height);
+      done();
+    });
+  });
+
+  it('Provide only one dimension with max, should default to crop', function(done) {
+    sharp(fixtures.inputJpg).resize(320).max().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(261, info.height);
+      done();
+    });
+  });
+
+  it('Do not enlarge when input width is already less than output width', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(2800)
+      .withoutEnlargement()
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(2725, info.width);
+        assert.strictEqual(2225, info.height);
+        done();
+      });
+  });
+
+  it('Do not enlarge when input height is already less than output height', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(null, 2300)
+      .withoutEnlargement()
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(2725, info.width);
+        assert.strictEqual(2225, info.height);
+        done();
+      });
+  });
+
+  it('Do enlarge when input width is less than output width', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(2800)
+      .withoutEnlargement(false)
+      .toBuffer(function(err, data, info) {
+        if (err) throw err;
+        assert.strictEqual(true, data.length > 0);
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(2800, info.width);
+        assert.strictEqual(2286, info.height);
+        done();
+      });
+  });
+
+});

test/unit/rotate.js

@@ -0,0 +1,151 @@
+'use strict';
+
+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) {
+    sharp(fixtures.inputJpg).rotate(90).resize(320, 240).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(240, info.height);
+      done();
+    });
+  });
+
+  it('Input image has Orientation EXIF tag but do not rotate output', function(done) {
+    sharp(fixtures.inputJpgWithExif)
+      .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);
+        assert.strictEqual(426, info.height);
+        done();
+      });
+  });
+
+  it('Input image has Orientation EXIF tag value of 8 (270 degrees), auto-rotate', function(done) {
+    sharp(fixtures.inputJpgWithExif)
+      .rotate()
+      .resize(320)
+      .toFile(fixtures.path('output.exif.8.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('Input image has Orientation EXIF tag value of 5 (270 degrees + flip), auto-rotate', function(done) {
+    sharp(fixtures.inputJpgWithExifMirroring)
+      .rotate()
+      .resize(320)
+      .toFile(fixtures.path('output.exif.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('Attempt to auto-rotate using image that has no EXIF', function(done) {
+    sharp(fixtures.inputJpg).rotate().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);
+      assert.strictEqual(261, info.height);
+      done();
+    });
+  });
+
+  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 {
+      sharp(fixtures.inputJpg).rotate(1);
+      fail = true;
+    } catch (e) {}
+    assert(!fail);
+    done();
+  });
+
+  it('Flip - vertical', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320)
+      .flip()
+      .toFile(fixtures.path('output.flip.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(261, info.height);
+        done();
+      });
+  });
+
+  it('Flop - horizontal', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320)
+      .flop()
+      .toFile(fixtures.path('output.flop.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(261, info.height);
+        done();
+      });
+  });
+
+  it('Flip and flop', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320)
+      .flop()
+      .toFile(fixtures.path('output.flip.flop.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(261, info.height);
+        done();
+      });
+  });
+
+  it('Neither flip nor flop', function(done) {
+    sharp(fixtures.inputJpg)
+      .resize(320)
+      .flip(false)
+      .flop(false)
+      .toFile(fixtures.path('output.flip.flop.nope.jpg'), function(err, info) {
+        if (err) throw err;
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(261, info.height);
+        done();
+      });
+  });
+
+});

test/unit/sharpen.js

@@ -0,0 +1,122 @@
+'use strict';
+
+var assert = require('assert');
+
+var sharp = require('../../index');
+var fixtures = require('../fixtures');
+
+sharp.cache(0);
+
+describe('Sharpen', function() {
+
+  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)
+      .toBuffer(function(err, notSharpened, info) {
+        if (err) throw err;
+        assert.strictEqual(true, notSharpened.length > 0);
+        assert.strictEqual('jpeg', info.format);
+        assert.strictEqual(320, info.width);
+        assert.strictEqual(240, info.height);
+        sharp(fixtures.inputJpg)
+          .resize(320, 240)
+          .sharpen(true)
+          .toBuffer(function(err, sharpened, info) {
+            if (err) throw err;
+            assert.strictEqual(true, sharpened.length > 0);
+            assert.strictEqual(true, sharpened.length > notSharpened.length);
+            assert.strictEqual('jpeg', info.format);
+            assert.strictEqual(320, info.width);
+            assert.strictEqual(240, info.height);
+            done();
+          });
+      });
+  });
+
+});

test/unit/util.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var assert = require('assert');
+var sharp = require('../../index');
+
+var defaultConcurrency = sharp.concurrency();
+
+describe('Utilities', function() {
+
+  describe('Cache', function() {
+    it('Can be disabled', function() {
+      var cache = sharp.cache(0, 0);
+      assert.strictEqual(0, cache.memory);
+      assert.strictEqual(0, cache.items);
+    });
+    it('Can be set to a maximum of 50MB and 500 items', function() {
+      var cache = sharp.cache(50, 500);
+      assert.strictEqual(50, cache.memory);
+      assert.strictEqual(500, cache.items);
+    });
+    it('Ignores invalid values', function() {
+      sharp.cache(50, 500);
+      var cache = sharp.cache('spoons');
+      assert.strictEqual(50, cache.memory);
+      assert.strictEqual(500, cache.items);
+    });
+  });
+
+  describe('Concurrency', function() {
+    it('Can be set to use 16 threads', function() {
+      sharp.concurrency(16);
+      assert.strictEqual(16, sharp.concurrency());
+    });
+    it('Can be reset to default', function() {
+      sharp.concurrency(0);
+      assert.strictEqual(defaultConcurrency, sharp.concurrency());
+    });
+    it('Ignores invalid values', function() {
+      sharp.concurrency(0);
+      sharp.concurrency('spoons');
+      assert.strictEqual(defaultConcurrency, sharp.concurrency());
+    });
+  });
+
+  describe('Counters', function() {
+    it('Have zero value at rest', function() {
+      var counters = sharp.counters();
+      assert.strictEqual(0, counters.queue);
+      assert.strictEqual(0, counters.process);
+    });
+  });
+
+});

tests/random.js

@@ -1,68 +0,0 @@
-var sharp = require("../index");
-var fs = require("fs");
-var path = require("path");
-var imagemagick = require("imagemagick");
-var gm = require("gm");
-var async = require("async");
-var assert = require("assert");
-var Benchmark = require("benchmark");
-
-var fixturesPath = path.join(__dirname, "fixtures");
-var inputJpg = path.join(fixturesPath, "2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/
-var outputJpg = path.join(fixturesPath, "output.jpg");
-
-var min = 320;
-var max = 960;
-
-var randomDimension = function() {
-  return Math.random() * (max - min) + min;
-};
-
-new Benchmark.Suite("random").add("imagemagick", {
-	defer: true,
-	fn: function(deferred) {
-		imagemagick.resize({
-			srcPath: inputJpg,
-			dstPath: outputJpg,
-			quality: 0.8,
-			width: randomDimension(),
-			height: randomDimension()
-		}, function(err) {
-			if (err) {
-				throw err;
-			} else {
-				deferred.resolve();
-			}
-		});
-	}
-}).add("gm", {
-	defer: true,
-	fn: function(deferred) {
-		gm(inputJpg).resize(randomDimension(), randomDimension()).quality(80).toBuffer(function (err, buffer) {
-			if (err) {
-				throw err;
-			} else {
-				assert.notStrictEqual(null, buffer);
-				deferred.resolve();
-			}
-		});
-	}
-}).add("sharp", {
-	defer: true,
-	fn: function(deferred) {
-		sharp(inputJpg).resize(randomDimension(), randomDimension()).toBuffer(function(err, buffer) {
-			if (err) {
-				throw err;
-			} else {
-				assert.notStrictEqual(null, buffer);
-				deferred.resolve();
-			}
-		});
-	}
-}).on("cycle", function(event) {
-  console.log(String(event.target));
-}).on("complete", function() {
-  var winner = this.filter("fastest").pluck("name");
-  assert.strictEqual("sharp", String(winner), "sharp was slower than " + winner);
-	console.dir(sharp.cache());
-}).run();

tests/unit.js

@@ -1,549 +0,0 @@
-/*jslint node: true */
-/*jslint es5: true */
-'use strict';
-
-var sharp = require("../index");
-var fs = require("fs");
-var path = require("path");
-var assert = require("assert");
-var async = require("async");
-
-var fixturesPath = path.join(__dirname, "fixtures");
-
-var inputJpg = path.join(fixturesPath, "2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/
-var outputJpg = path.join(fixturesPath, "output.jpg");
-
-var inputTiff = path.join(fixturesPath, "G31D.TIF"); // http://www.fileformat.info/format/tiff/sample/e6c9a6e5253348f4aef6d17b534360ab/index.htm
-var outputTiff = path.join(fixturesPath, "output.tiff");
-
-var inputJpgWithExif = path.join(fixturesPath, "Landscape_8.jpg"); // https://github.com/recurser/exif-orientation-examples/blob/master/Landscape_8.jpg
-
-var inputPng = path.join(fixturesPath, "50020484-00001.png"); // http://c.searspartsdirect.com/lis_png/PLDM/50020484-00001.png
-var inputWebp = path.join(fixturesPath, "4.webp"); // http://www.gstatic.com/webp/gallery/4.webp
-var inputGif = path.join(fixturesPath, "Crash_test.gif"); // http://upload.wikimedia.org/wikipedia/commons/e/e3/Crash_test.gif
-
-// Ensure cache limits can be set
-sharp.cache(0); // Disable
-sharp.cache(50, 500); // 50MB, 500 items
-
-async.series([
-  // Resize with exact crop
-  function(done) {
-    sharp(inputJpg).resize(320, 240).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // Resize to fixed width
-  function(done) {
-    sharp(inputJpg).resize(320).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(261, info.height);
-      done();
-    });
-  },
-  // Resize to fixed height
-  function(done) {
-    sharp(inputJpg).resize(null, 320).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(391, info.width);
-      assert.strictEqual(320, info.height);
-      done();
-    });
-  },
-  // Identity transform
-  function(done) {
-    sharp(inputJpg).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(2725, info.width);
-      assert.strictEqual(2225, info.height);
-      done();
-    });
-  },
-  // Upscale
-  function(done) {
-    sharp(inputJpg).resize(3000).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(3000, info.width);
-      assert.strictEqual(2449, info.height);
-      done();
-    });
-  },
-  // Quality
-  function(done) {
-    sharp(inputJpg).resize(320, 240).quality(70).toBuffer(function(err, buffer70) {
-      if (err) throw err;
-      sharp(inputJpg).resize(320, 240).toBuffer(function(err, buffer80) {
-        if (err) throw err;
-        sharp(inputJpg).resize(320, 240).quality(90).toBuffer(function(err, buffer90) {
-          assert(buffer70.length < buffer80.length);
-          assert(buffer80.length < buffer90.length);
-          done();
-        });
-      });
-    });
-  },
-  // TIFF with dimensions known to cause rounding errors
-  function(done) {
-    sharp(inputTiff).resize(240, 320).embedBlack().jpeg().toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(240, info.width);
-      assert.strictEqual(320, info.height);
-      done();
-    });
-  },
-  function(done) {
-    sharp(inputTiff).resize(240, 320).jpeg().toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(240, info.width);
-      assert.strictEqual(320, info.height);
-      done();
-    });
-  },
-  // Resize to max width or height considering ratio (landscape)
-  function(done) {
-    sharp(inputJpg).resize(320, 320).max().toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(261, info.height);
-      done();
-    });
-  },
-  // Resize to max width or height considering ratio (portrait)
-  function(done) {
-    sharp(inputTiff).resize(320, 320).max().jpeg().toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(243, info.width);
-      assert.strictEqual(320, info.height);
-      done();
-    });
-  },
-  // Attempt to resize to max but only provide one dimension, so should default to crop
-  function(done) {
-    sharp(inputJpg).resize(320).max().toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(261, info.height);
-      done();
-    });
-  },
-  // Attempt to output to input, should fail
-  function(done) {
-    sharp(inputJpg).toFile(inputJpg, function(err) {
-      assert(!!err);
-      done();
-    });
-  },
-  // Rotate by 90 degrees, respecting output input size
-  function(done) {
-    sharp(inputJpg).rotate(90).resize(320, 240).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // Input image has Orientation EXIF tag but do not rotate output
-  function(done) {
-    sharp(inputJpgWithExif).resize(320).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(426, info.height);
-      done();
-    });
-  },
-  // Input image has Orientation EXIF tag value of 8 (270 degrees), auto-rotate
-  function(done) {
-    sharp(inputJpgWithExif).rotate().resize(320).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // Attempt to auto-rotate using image that has no EXIF
-  function(done) {
-    sharp(inputJpg).rotate().resize(320).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(261, info.height);
-      done();
-    });
-  },
-  // Rotate to an invalid angle, should fail
-  function(done) {
-    var fail = false;
-    try {
-      sharp(inputJpg).rotate(1);
-      fail = true;
-    } catch (e) {}
-    assert(!fail);
-    done();
-  },
-  // Do not enlarge the output if the input width is already less than the output width
-  function(done) {
-    sharp(inputJpg).resize(2800).withoutEnlargement().toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(2725, info.width);
-      assert.strictEqual(2225, info.height);
-      done();
-    });
-  },
-  // Do not enlarge the output if the input height is already less than the output height
-  function(done) {
-    sharp(inputJpg).resize(null, 2300).withoutEnlargement().toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(2725, info.width);
-      assert.strictEqual(2225, info.height);
-      done();
-    });
-  },
-  // Promises/A+
-  function(done) {
-    sharp(inputJpg).resize(320, 240).toBuffer().then(function(data) {
-      sharp(data).toBuffer(function(err, data, info) {
-        if (err) throw err;
-        assert.strictEqual(true, data.length > 0);
-        assert.strictEqual(320, info.width);
-        assert.strictEqual(240, info.height);
-        done();
-      });
-    }).catch(function(err) {
-      throw err;
-    });
-  },
-  // Empty Buffer, should fail
-  function(done) {
-    var fail = false;
-    try {
-      sharp(new Buffer(0));
-      fail = true;
-    } catch (e) {}
-    assert(!fail);
-    done();
-  },
-  // Check colour space conversion occurs from TIFF to WebP (this used to segfault)
-  function(done) {
-    sharp(inputTiff).webp().toBuffer().then(function() {
-      done();
-    });
-  },
-  // Interpolation: bilinear
-  function(done) {
-    sharp(inputJpg).resize(320, 240).interpolateWith(sharp.interpolator.bilinear).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // Interpolation: bicubic
-  function(done) {
-    sharp(inputJpg).resize(320, 240).interpolateWith(sharp.interpolator.bicubic).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // Interpolation: nohalo
-  function(done) {
-    sharp(inputJpg).resize(320, 240).interpolateWith(sharp.interpolator.nohalo).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // Interpolation: locally bounded bicubic (LBB)
-  function(done) {
-    sharp(inputJpg).resize(320, 240).interpolateWith(sharp.interpolator.locallyBoundedBicubic).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // Interpolation: vertex split quadratic basis spline (VSQBS)
-  function(done) {
-    sharp(inputJpg).resize(320, 240).interpolateWith(sharp.interpolator.vertexSplitQuadraticBasisSpline).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(true, data.length > 0);
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-  },
-  // File-Stream
-  function(done) {
-    var writable = fs.createWriteStream(outputJpg);
-    writable.on('finish', function() {
-      sharp(outputJpg).toBuffer(function(err, data, info) {
-        if (err) throw err;
-        assert.strictEqual(true, data.length > 0);
-        assert.strictEqual(320, info.width);
-        assert.strictEqual(240, info.height);
-        fs.unlinkSync(outputJpg);
-        done();
-      });
-    });
-    sharp(inputJpg).resize(320, 240).pipe(writable);
-  },
-  // Buffer-Stream
-  function(done) {
-    var inputJpgBuffer = fs.readFileSync(inputJpg);
-    var writable = fs.createWriteStream(outputJpg);
-    writable.on('finish', function() {
-      sharp(outputJpg).toBuffer(function(err, data, info) {
-        if (err) throw err;
-        assert.strictEqual(true, data.length > 0);
-        assert.strictEqual(320, info.width);
-        assert.strictEqual(240, info.height);
-        fs.unlinkSync(outputJpg);
-        done();
-      });
-    });
-    sharp(inputJpgBuffer).resize(320, 240).pipe(writable);
-  },
-  // Stream-File
-  function(done) {
-    var readable = fs.createReadStream(inputJpg);
-    var pipeline = sharp().resize(320, 240).toFile(outputJpg, function(err, info) {
-      if (err) throw err;
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      fs.unlinkSync(outputJpg);
-      done();
-    });
-    readable.pipe(pipeline);
-  },
-  // Stream-Buffer
-  function(done) {
-    var readable = fs.createReadStream(inputJpg);
-    var pipeline = sharp().resize(320, 240).toBuffer(function(err, data, info) {
-      if (err) throw err;
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(240, info.height);
-      done();
-    });
-    readable.pipe(pipeline);
-  },
-  // Stream-Stream
-  function(done) {
-    var readable = fs.createReadStream(inputJpg);
-    var writable = fs.createWriteStream(outputJpg);
-    writable.on('finish', function() {
-      sharp(outputJpg).toBuffer(function(err, data, info) {
-        if (err) throw err;
-        assert.strictEqual(true, data.length > 0);
-        assert.strictEqual(320, info.width);
-        assert.strictEqual(240, info.height);
-        fs.unlinkSync(outputJpg);
-        done();
-      });
-    });
-    var pipeline = sharp().resize(320, 240);
-    readable.pipe(pipeline).pipe(writable);
-  },
-  // Crop, gravity=north
-  function(done) {
-    sharp(inputJpg).resize(320, 80).crop(sharp.gravity.north).toFile(path.join(fixturesPath, 'output.gravity-north.jpg'), function(err, info) {
-      if (err) throw err;
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(80, info.height);
-      done();
-    });
-  },
-  // Crop, gravity=east
-  function(done) {
-    sharp(inputJpg).resize(80, 320).crop(sharp.gravity.east).toFile(path.join(fixturesPath, 'output.gravity-east.jpg'), function(err, info) {
-      if (err) throw err;
-      assert.strictEqual(80, info.width);
-      assert.strictEqual(320, info.height);
-      done();
-    });
-  },
-  // Crop, gravity=south
-  function(done) {
-    sharp(inputJpg).resize(320, 80).crop(sharp.gravity.south).toFile(path.join(fixturesPath, 'output.gravity-south.jpg'), function(err, info) {
-      if (err) throw err;
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(80, info.height);
-      done();
-    });
-  },
-  // Crop, gravity=west
-  function(done) {
-    sharp(inputJpg).resize(80, 320).crop(sharp.gravity.west).toFile(path.join(fixturesPath, 'output.gravity-west.jpg'), function(err, info) {
-      if (err) throw err;
-      assert.strictEqual(80, info.width);
-      assert.strictEqual(320, info.height);
-      done();
-    });
-  },
-  // Crop, gravity=center
-  function(done) {
-    sharp(inputJpg).resize(320, 80).crop(sharp.gravity.center).toFile(path.join(fixturesPath, 'output.gravity-center.jpg'), function(err, info) {
-      if (err) throw err;
-      assert.strictEqual(320, info.width);
-      assert.strictEqual(80, info.height);
-      done();
-    });
-  },
-  // Crop, gravity=centre
-  function(done) {
-    sharp(inputJpg).resize(80, 320).crop(sharp.gravity.centre).toFile(path.join(fixturesPath, 'output.gravity-centre.jpg'), function(err, info) {
-      if (err) throw err;
-      assert.strictEqual(80, info.width);
-      assert.strictEqual(320, info.height);
-      done();
-    });
-  },
-  // Metadata - JPEG
-  function(done) {
-    sharp(inputJpg).metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('jpeg', metadata.format);
-      assert.strictEqual(2725, metadata.width);
-      assert.strictEqual(2225, metadata.height);
-      assert.strictEqual('srgb', metadata.space);
-      assert.strictEqual(3, metadata.channels);
-      assert.strictEqual('undefined', typeof metadata.orientation);
-      done();
-    });
-  },
-  // Metadata - JPEG with EXIF
-  function(done) {
-    sharp(inputJpgWithExif).metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('jpeg', metadata.format);
-      assert.strictEqual(450, metadata.width);
-      assert.strictEqual(600, metadata.height);
-      assert.strictEqual('srgb', metadata.space);
-      assert.strictEqual(3, metadata.channels);
-      assert.strictEqual(8, metadata.orientation);
-      done();
-    });
-  },
-  // Metadata - TIFF
-  function(done) {
-    sharp(inputTiff).metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('tiff', metadata.format);
-      assert.strictEqual(2464, metadata.width);
-      assert.strictEqual(3248, metadata.height);
-      assert.strictEqual('b-w', metadata.space);
-      assert.strictEqual(1, metadata.channels);
-      done();
-    });
-  },
-  // Metadata - PNG
-  function(done) {
-    sharp(inputPng).metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('png', metadata.format);
-      assert.strictEqual(2809, metadata.width);
-      assert.strictEqual(2074, metadata.height);
-      assert.strictEqual('b-w', metadata.space);
-      assert.strictEqual(1, metadata.channels);
-      done();
-    });
-  },
-  // Metadata - WebP
-  function(done) {
-    sharp(inputWebp).metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('webp', metadata.format);
-      assert.strictEqual(1024, metadata.width);
-      assert.strictEqual(772, metadata.height);
-      assert.strictEqual('srgb', metadata.space);
-      assert.strictEqual(3, metadata.channels);
-      done();
-    });
-  },
-  // Metadata - GIF (via libmagick)
-  function(done) {
-    sharp(inputGif).metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('magick', metadata.format);
-      assert.strictEqual(800, metadata.width);
-      assert.strictEqual(533, metadata.height);
-      assert.strictEqual(3, metadata.channels);
-      done();
-    });
-  },
-  // Metadata - Promise
-  function(done) {
-    sharp(inputJpg).metadata().then(function(metadata) {
-      assert.strictEqual('jpeg', metadata.format);
-      assert.strictEqual(2725, metadata.width);
-      assert.strictEqual(2225, metadata.height);
-      assert.strictEqual('srgb', metadata.space);
-      assert.strictEqual(3, metadata.channels);
-      done();
-    });
-  },
-  // Metadata - Stream
-  function(done) {
-    var readable = fs.createReadStream(inputJpg);
-    var pipeline = sharp().metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('jpeg', metadata.format);
-      assert.strictEqual(2725, metadata.width);
-      assert.strictEqual(2225, metadata.height);
-      assert.strictEqual('srgb', metadata.space);
-      assert.strictEqual(3, metadata.channels);
-      done();
-    });
-    readable.pipe(pipeline);
-  },
-  // Get metadata then resize to half width
-  function(done) {
-    var image = sharp(inputJpg);
-    image.metadata(function(err, metadata) {
-      if (err) throw err;
-      assert.strictEqual('jpeg', metadata.format);
-      assert.strictEqual(2725, metadata.width);
-      assert.strictEqual(2225, metadata.height);
-      assert.strictEqual('srgb', metadata.space);
-      assert.strictEqual(3, metadata.channels);
-      image.resize(metadata.width / 2).toBuffer(function(err, data, info) {
-        if (err) throw err;
-        assert.strictEqual(true, data.length > 0);
-        assert.strictEqual(1362, info.width);
-        assert.strictEqual(1112, info.height);
-        done();
-      });
-    });
-  },
-  // Verify internal counters
-  function(done) {
-    var counters = sharp.counters();
-    assert.strictEqual(0, counters.queue);
-    assert.strictEqual(0, counters.process);
-    done();
-  }
-]);