Add details of performance test task - closes #12

Uses a PPA with back-ported libwebp to work around https://bugs.launchpad.net/ubuntu/+source/libwebp/+bug/1108731

.gitignore

@@ -12,6 +12,6 @@ logs
 results
 build
 node_modules
-tests/output.*
+tests/fixtures/output.*
 
 npm-debug.log

.travis.yml

@@ -0,0 +1,16 @@
+language: node_js
+node_js:
+  - "0.10"
+before_install:
+  - sudo add-apt-repository ppa:lyrasis/precise-backports -y
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq automake gobject-introspection gtk-doc-tools libfftw3-dev libglib2.0-dev libjpeg-turbo8-dev libpng12-dev libwebp-dev libtiff4-dev liborc-0.4-dev libxml2-dev swig graphicsmagick libmagick++-dev
+  - git clone https://github.com/jcupitt/libvips.git
+  - cd libvips
+  - git checkout 7.38
+  - ./bootstrap.sh
+  - ./configure --enable-debug=no --enable-cxx=no --without-python
+  - make
+  - sudo make install
+  - sudo ldconfig
+  - cd $TRAVIS_BUILD_DIR

README.md

@@ -1,45 +1,58 @@
 # sharp
 
-_adj_
+* [Installation](https://github.com/lovell/sharp#installation)
+* [Usage examples](https://github.com/lovell/sharp#usage-examples)
+* [API](https://github.com/lovell/sharp#api)
+* [Testing](https://github.com/lovell/sharp#testing)
+* [Performance](https://github.com/lovell/sharp#performance)
+* [Licence](https://github.com/lovell/sharp#licence)
 
-1. clearly defined; distinct: a sharp photographic image.
+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.
-2. quick, brisk, or spirited.
-3. shrewd or astute: a sharp bargainer.
-4. (Informal.) very stylish: a sharp dresser; a sharp jacket.
 
-The typical use case for this high speed Node.js module is to convert large JPEG, PNG, WebP and TIFF images to smaller images of varying dimensions.
+The performance of JPEG resizing is typically 8x faster than ImageMagick and GraphicsMagick, based mainly on the number of CPU cores available. Everything remains non-blocking thanks to _libuv_.
 
-The performance of JPEG resizing is typically 15x-25x faster than ImageMagick and GraphicsMagick, based mainly on the number of CPU cores available.
+This module supports reading and writing images of JPEG, PNG and WebP to and from both Buffer objects and the filesystem. It also supports reading images of many other types from the filesystem via libmagick++ or libgraphicsmagick++ if present.
 
-This module supports reading and writing images to and from both the filesystem and Buffer objects (TIFF is limited to filesystem only). Everything remains non-blocking thanks to _libuv_.
+When generating JPEG output all metadata is removed and Huffman tables optimised without having to use separate command line tools like [jpegoptim](https://github.com/tjko/jpegoptim) and [jpegtran](http://jpegclub.org/jpegtran/).
 
-Anyone who has used the Node.js bindings for [GraphicsMagick](https://github.com/aheckmann/gm) will find the API similarly expressive.
+Anyone who has used the Node.js bindings for [GraphicsMagick](https://github.com/aheckmann/gm) will find the API similarly fluent.
 
 This module is powered by the blazingly fast [libvips](https://github.com/jcupitt/libvips) image processing library, originally created in 1989 at Birkbeck College and currently maintained by John Cupitt.
 
-## Prerequisites
+## Installation
 
-* Node.js v0.8+
+	npm install sharp
+
+### Prerequisites
+
+* Node.js v0.10+
 * [libvips](https://github.com/jcupitt/libvips) v7.38.5+
 
 ### Install libvips on Mac OS
 
-	brew install homebrew/science/vips
+	brew install homebrew/science/vips --with-webp --with-graphicsmagick
+
+The _gettext_ dependency of _libvips_ [can lead](https://github.com/lovell/sharp/issues/9) to a `library not found for -lintl` error. If so, please try:
+
+	brew link gettext --force
 
 ### Install libvips on Ubuntu/Debian Linux
 
 	sudo apt-get install automake build-essential git gobject-introspection gtk-doc-tools libfftw3-dev libglib2.0-dev libjpeg-turbo8-dev libpng12-dev libwebp-dev libtiff5-dev liborc-0.4-dev libxml2-dev swig
 	git clone https://github.com/jcupitt/libvips.git
 	cd libvips
+	git checkout 7.38
 	./bootstrap.sh
-	./configure --enable-debug=no
+	./configure --enable-debug=no --enable-cxx=no --without-python
 	make
 	sudo make install
 	sudo ldconfig
 
-## Install
+Ubuntu 12.04 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 command first:
 
-	npm install sharp
+	sudo add-apt-repository ppa:lyrasis/precise-backports
+	sudo apt-get update
+	sudo apt-get install libtiff4-dev
 
 ## Usage examples
 
@@ -86,12 +99,12 @@ sharp(buffer).resize(200, 300).embedWhite().write('output.tiff', function(err) {
 ```
 
 ```javascript
-sharp('input.jpg').resize(200, 300).embedBlack().webp(function(err, buffer) {
+sharp('input.gif').resize(200, 300).embedBlack().webp(function(err, buffer) {
   if (err) {
     throw err;
   }
   // buffer contains WebP image data of a 200 pixels wide and 300 pixels high image
-  // containing a scaled version, embedded on a black canvas, of input.png
+  // containing a scaled version, embedded on a black canvas, of input.gif
 });
 ```
 
@@ -99,9 +112,10 @@ sharp('input.jpg').resize(200, 300).embedBlack().webp(function(err, buffer) {
 
 ### sharp(input)
 
-Constructor to which further methods are chained.
+Constructor to which further methods are chained. `input` can be one of:
 
-`input` can either be a filename String or a Buffer.
+* Buffer containing JPEG, PNG or WebP image data, or
+* String containing the filename of an image, with most major formats supported.
 
 ### resize(width, [height])
 
@@ -129,7 +143,7 @@ Perform a mild sharpen of the resultant image. This typically reduces performanc
 
 ### progressive()
 
-Use progressive (interlace) scan for the output. This typically reduces performance by 30%.
+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.
 
 ### sequentialRead()
 
@@ -161,7 +175,7 @@ Write WebP image data to a Buffer.
 
 ### toBuffer(callback)
 
-Write image data to a Buffer, the format of which will match the input image.
+Write image data to a Buffer, the format of which will match the input image. JPEG, PNG and WebP are supported.
 
 `callback` gets two arguments `(err, buffer)` where `err` is an error message, if any, and `buffer` is the resultant image data.
 
@@ -181,74 +195,59 @@ sharp.cache(50); // { current: 49, high: 115, limit: 50 }
 
 ## Testing
 
+[![Build Status](https://travis-ci.org/lovell/sharp.png?branch=master)](https://travis-ci.org/lovell/sharp)
+
 	npm test
 
+Running the tests requires both ImageMagick and GraphicsMagick plus one of either libmagick++-dev or libgraphicsmagick++.
+
+	brew install imagemagick
+	brew install graphicsmagick
+
+	sudo apt-get install imagemagick graphicsmagick libmagick++-dev
+
 ## Performance
 
-Test environment:
+### Test environment
 
-* AMD Athlon 4 core 3.3GHz 512KB L2 CPU 1333 DDR3
+* 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
-* libvips 7.38
+* Ubuntu 13.10
-* libjpeg-turbo8 1.3.0
+* libvips 7.38.5
-* libpng 1.6.6
-* zlib1g 1.2.7
-* libwebp 0.3.0
-* libtiff 4.0.2
 
-`-file-buffer` indicates read from file and write to buffer, `-buffer-file` indicates read from buffer and write to file etc.
+### The contenders
 
-`-sharpen`, `-progressive` etc. demonstrate the negative effect of options on performance.
+* [imagemagick-native](https://github.com/mash/node-imagemagick-native) - 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".
+* [gm](https://github.com/aheckmann/gm) - Fully featured wrapper around GraphicsMagick.
+* sharp - Caching within libvips disabled to ensure a fair comparison.
 
-### JPEG
+### The task
 
-* imagemagick x 5.53 ops/sec ±0.62% (31 runs sampled)
+Decompress a 2725x2225 JPEG image, resize and crop to 720x480, then compress to JPEG.
-* gm-file-file x 4.10 ops/sec ±0.41% (25 runs sampled)
-* gm-file-buffer x 4.10 ops/sec ±0.36% (25 runs sampled)
-* epeg-file-file x 23.82 ops/sec ±0.18% (60 runs sampled)
-* epeg-file-buffer x 23.98 ops/sec ±0.16% (61 runs sampled)
 
-* sharp-buffer-file x 20.76 ops/sec ±0.55% (54 runs sampled)
+### Results
-* sharp-buffer-buffer x 20.90 ops/sec ±0.26% (54 runs sampled)
-* sharp-file-file x 91.78 ops/sec ±0.38% (88 runs sampled)
-* sharp-file-buffer x __93.05 ops/sec__ ±0.61% (76 runs sampled)
 
-* sharp-file-buffer-sharpen x 63.09 ops/sec ±5.58% (63 runs sampled)
+| Module                | Input  | Output | Ops/sec | Speed-up |
-* sharp-file-buffer-progressive x 61.68 ops/sec ±0.53% (76 runs sampled)
+| :-------------------- | :----- | :----- | ------: | -------: |
-* sharp-file-buffer-sequentialRead x 60.66 ops/sec ±0.38% (75 runs sampled)
+| imagemagick-native    | buffer | buffer |    0.97 |        1 |
+| imagemagick           | file   | file   |    2.49 |      2.6 |
+| gm                    | buffer | file   |    3.72 |      3.8 |
+| gm                    | buffer | buffer |    3.80 |      3.9 |
+| gm                    | file   | file   |    3.67 |      3.8 |
+| gm                    | file   | buffer |    3.67 |      3.8 |
+| sharp                 | buffer | file   |   13.62 |     14.0 |
+| sharp                 | buffer | buffer |   12.43 |     12.8 |
+| sharp                 | file   | file   |   13.02 |     13.4 |
+| sharp                 | file   | buffer |   11.15 |     11.5 |
+| sharp +sharpen        | file   | buffer |   10.26 |     10.6 |
+| sharp +progressive    | file   | buffer |    9.44 |      9.7 |
+| sharp +sequentialRead | file   | buffer |   11.94 |     12.3 |
 
-### PNG
+You can expect much greater performance with caching enabled (default) and using 16+ core machines.
-
-* imagemagick x 4.27 ops/sec ±0.21% (25 runs sampled)
-* gm-file-file x 8.33 ops/sec ±0.19% (44 runs sampled)
-* gm-file-buffer x 7.45 ops/sec ±0.16% (40 runs sampled)
- 
-* sharp-buffer-file x 4.94 ops/sec ±118.46% (26 runs sampled)
-* sharp-buffer-buffer x 12.59 ops/sec ±0.55% (64 runs sampled)
-* sharp-file-file x 44.06 ops/sec ±6.86% (75 runs sampled)
-* sharp-file-buffer x __46.29 ops/sec__ ±0.38% (76 runs sampled)
-
-* sharp-file-buffer-sharpen x 38.86 ops/sec ±0.22% (65 runs sampled)
-* sharp-file-buffer-progressive x 46.35 ops/sec ±0.20% (76 runs sampled)
-* sharp-file-buffer-sequentialRead x 29.02 ops/sec ±0.62% (72 runs sampled)
-
-### WebP
-
-* sharp-buffer-file x 3.30 ops/sec ±117.14% (19 runs sampled)
-* sharp-buffer-buffer x 7.66 ops/sec ±5.83% (43 runs sampled)
-* sharp-file-file x 9.88 ops/sec ±0.98% (52 runs sampled)
-* sharp-file-buffer x 9.95 ops/sec ±0.25% (52 runs sampled)
-* sharp-file-buffer-sharpen x 9.05 ops/sec ±0.36% (48 runs sampled)
-* sharp-file-buffer-sequentialRead x 9.87 ops/sec ±0.98% (52 runs sampled)
-
-### TIFF
-
-* sharp-file-file x 68.24 ops/sec ±5.93% (85 runs sampled)
-* sharp-file-file-sharpen x 50.76 ops/sec ±0.52% (82 runs sampled)
-* sharp-file-file-sequentialRead x 36.37 ops/sec ±0.90% (87 runs sampled)
 
 ## Licence
 
-Copyright 2013, 2014 Lovell Fuller
+Copyright 2013, 2014 Lovell Fuller and Pierre Inglebert
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

binding.gyp

@@ -3,15 +3,15 @@
     'target_name': 'sharp',
     'sources': ['src/sharp.cc'],
     'libraries': [
-      '<!@(PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" pkg-config --libs vips)',
+      '<!@(PKG_CONFIG_PATH="/usr/local/Library/ENV/pkgconfig/10.8:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig" pkg-config --libs vips)'
-      '<!@(PKG_CONFIG_PATH="/usr/lib/pkgconfig" pkg-config --libs vips)'
     ],
     'include_dirs': [
       '/usr/local/include/glib-2.0',
       '/usr/local/lib/glib-2.0/include',
       '/usr/include/glib-2.0',
       '/usr/lib/glib-2.0/include',
-      '/usr/lib/x86_64-linux-gnu/glib-2.0/include'
+      '/usr/lib/x86_64-linux-gnu/glib-2.0/include',
+      '<!(node -e "require(\'nan\')")'
     ],
     'cflags': ['-fexceptions', '-pedantic', '-Wall', '-O3'],
     'cflags_cc': ['-fexceptions', '-pedantic', '-Wall', '-O3']

package.json

@@ -1,8 +1,11 @@
 {
   "name": "sharp",
-  "version": "0.2.0",
+  "version": "0.3.0",
-  "author": "Lovell Fuller",
+  "author": "Lovell Fuller <npm@lovell.info>",
-  "description": "High performance module to resize JPEG, PNG, WebP and TIFF images using the libvips image processing library",
+  "contributors": [
+    "Pierre Inglebert <pierre.inglebert@gmail.com>"
+  ],
+  "description": "High performance Node.js module to resize JPEG, PNG and WebP images using the libvips library",
   "scripts": {
     "test": "node tests/unit && node tests/perf"
   },
@@ -16,6 +19,7 @@
     "png",
     "webp",
     "tiff",
+    "gif",
     "resize",
     "thumbnail",
     "sharpen",
@@ -26,15 +30,18 @@
     "fast",
     "buffer"
   ],
+  "dependencies": {
+    "nan": "^0.8.0"
+  },
   "devDependencies": {
-    "imagemagick": "*",
+    "imagemagick": "^0.1.3",
-    "gm": "*",
+    "imagemagick-native": "^0.2.9",
-    "epeg": "*",
+    "gm": "^1.14.2",
-    "async": "*",
+    "async": "^0.6.2",
-    "benchmark": "*"
+    "benchmark": "^1.0.0"
   },
   "license": "Apache 2.0",
   "engines": {
-    "node": ">=0.8"
+    "node": ">=0.10"
   }
-}
+}

src/sharp.cc

@@ -5,6 +5,8 @@
 #include <string.h>
 #include <vips/vips.h>
 
+#include "nan.h"
+
 using namespace v8;
 using namespace node;
 
@@ -23,7 +25,6 @@ struct resize_baton {
   bool progessive;
   VipsAccess access_method;
   std::string err;
-  Persistent<Function> callback;
 
   resize_baton(): buffer_in_len(0), buffer_out_len(0) {}
 };
@@ -32,7 +33,8 @@ typedef enum {
   JPEG,
   PNG,
   WEBP,
-  TIFF
+  TIFF,
+  MAGICK
 } ImageType;
 
 unsigned char MARKER_JPEG[] = {0xff, 0xd8};
@@ -67,253 +69,256 @@ void resize_error(resize_baton *baton, VipsImage *unref) {
   return;
 }
 
-void resize_async(uv_work_t *work) {
+class ResizeWorker : public NanAsyncWorker {
-  resize_baton* baton = static_cast<resize_baton*>(work->data);
+ public:
+  ResizeWorker(NanCallback *callback, resize_baton *baton)
+    : NanAsyncWorker(callback), baton(baton) {}
+  ~ResizeWorker() {}
 
-  // Input
+  void Execute () {
-  ImageType inputImageType = JPEG;
+    // Input
-  VipsImage *in = vips_image_new();
+    ImageType inputImageType = JPEG;
-  if (baton->buffer_in_len > 1) {
+    VipsImage *in = vips_image_new();
-    if (memcmp(MARKER_JPEG, baton->buffer_in, 2) == 0) {
+    if (baton->buffer_in_len > 1) {
-      if (vips_jpegload_buffer(baton->buffer_in, baton->buffer_in_len, &in, "access", baton->access_method, NULL)) {
+      if (memcmp(MARKER_JPEG, baton->buffer_in, 2) == 0) {
+        if (vips_jpegload_buffer(baton->buffer_in, baton->buffer_in_len, &in, "access", baton->access_method, NULL)) {
+          return resize_error(baton, in);
+        }
+      } else if(memcmp(MARKER_PNG, baton->buffer_in, 2) == 0) {
+        inputImageType = PNG;
+        if (vips_pngload_buffer(baton->buffer_in, baton->buffer_in_len, &in, "access", baton->access_method, NULL)) {
+          return resize_error(baton, in);
+        }
+      } else if(memcmp(MARKER_WEBP, baton->buffer_in, 2) == 0) {
+        inputImageType = WEBP;
+        if (vips_webpload_buffer(baton->buffer_in, baton->buffer_in_len, &in, "access", baton->access_method, NULL)) {
+          return resize_error(baton, in);
+        }
+      } else {
+        resize_error(baton, in);
+        (baton->err).append("Unsupported input buffer");
+        return;
+      }
+    } else if (vips_foreign_is_a("jpegload", baton->file_in.c_str())) {
+      if (vips_jpegload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
         return resize_error(baton, in);
       }
-    } else if(memcmp(MARKER_PNG, baton->buffer_in, 2) == 0) {
+    } else if (vips_foreign_is_a("pngload", baton->file_in.c_str())) {
       inputImageType = PNG;
-      if (vips_pngload_buffer(baton->buffer_in, baton->buffer_in_len, &in, "access", baton->access_method, NULL)) {
+      if (vips_pngload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
         return resize_error(baton, in);
       }
-    } else if(memcmp(MARKER_WEBP, baton->buffer_in, 2) == 0) {
+    } else if (vips_foreign_is_a("webpload", baton->file_in.c_str())) {
       inputImageType = WEBP;
-      if (vips_webpload_buffer(baton->buffer_in, baton->buffer_in_len, &in, "access", baton->access_method, NULL)) {
+      if (vips_webpload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
+        return resize_error(baton, in);
+      }
+    } else if (vips_foreign_is_a("tiffload", baton->file_in.c_str())) {
+      inputImageType = TIFF;
+      if (vips_tiffload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
+        return resize_error(baton, in);
+      }
+    } else if(vips_foreign_is_a("magickload", (baton->file_in).c_str())) {
+      inputImageType = MAGICK;
+      if (vips_magickload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
         return resize_error(baton, in);
       }
     } else {
       resize_error(baton, in);
-      (baton->err).append("Unsupported input buffer");
+      (baton->err).append("Unsupported input file " + baton->file_in);
       return;
     }
-  } else if (is_jpeg(baton->file_in)) {
-    if (vips_jpegload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
-      return resize_error(baton, in);
-    }
-  } else if (is_png(baton->file_in)) {
-    inputImageType = PNG;
-    if (vips_pngload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
-      return resize_error(baton, in);
-    }
-  } else if (is_webp(baton->file_in)) {
-    inputImageType = WEBP;
-    if (vips_webpload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
-      return resize_error(baton, in);
-    }
-  } else if (is_tiff(baton->file_in)) {
-    inputImageType = TIFF;
-    if (vips_tiffload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
-      return resize_error(baton, in);
-    }
-  } else {
-    resize_error(baton, in);
-    (baton->err).append("Unsupported input file " + baton->file_in);
-    return;
-  }
 
-  // Scaling calculations
+    // Scaling calculations
-  double factor;
+    double factor;
-  if (baton->width > 0 && baton->height > 0) {
+    if (baton->width > 0 && baton->height > 0) {
-    // Fixed width and height
+      // Fixed width and height
-    double xfactor = (double)(in->Xsize) / (double)(baton->width);
+      double xfactor = (double)(in->Xsize) / (double)(baton->width);
-    double yfactor = (double)(in->Ysize) / (double)(baton->height);
+      double yfactor = (double)(in->Ysize) / (double)(baton->height);
-    factor = baton->crop ? std::min(xfactor, yfactor) : std::max(xfactor, yfactor);
+      factor = baton->crop ? std::min(xfactor, yfactor) : std::max(xfactor, yfactor);
-  } else if (baton->width > 0) {
+    } else if (baton->width > 0) {
-    // Fixed width, auto height
+      // Fixed width, auto height
-    factor = (double)(in->Xsize) / (double)(baton->width);
+      factor = (double)(in->Xsize) / (double)(baton->width);
-    baton->height = floor((double)(in->Ysize) / factor);
+      baton->height = floor((double)(in->Ysize) / factor);
-  } else if (baton->height > 0) {
+    } else if (baton->height > 0) {
-    // Fixed height, auto width
+      // Fixed height, auto width
-    factor = (double)(in->Ysize) / (double)(baton->height);
+      factor = (double)(in->Ysize) / (double)(baton->height);
-    baton->width = floor((double)(in->Xsize) / factor);
+      baton->width = floor((double)(in->Xsize) / factor);
-  } else {
+    } else {
-    // Identity transform
+      // Identity transform
-    factor = 1;
+      factor = 1;
-    baton->width = in->Xsize;
+      baton->width = in->Xsize;
-    baton->height = in->Ysize;
+      baton->height = in->Ysize;
-  }
-  int shrink = floor(factor);
-  if (shrink < 1) {
-    shrink = 1;
-  }
-  double residual = shrink / (double)factor;
-
-  // 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;
     }
-  }
+    int shrink = floor(factor);
-  VipsImage *shrunk_on_load = vips_image_new();
+    if (shrink < 1) {
-  if (shrink_on_load > 1) {
+      shrink = 1;
-    // Recalculate integral shrink and double residual
+    }
-    factor = std::max(factor, 1.0);
+    double residual = shrink / (double)factor;
-    shrink = floor(factor);
+
-    residual = shrink / factor;
+    // Try to use libjpeg shrink-on-load
-    // Reload input using shrink-on-load 
+    int shrink_on_load = 1;
-    if (baton->buffer_in_len > 1) {
+    if (inputImageType == JPEG) {
-      if (vips_jpegload_buffer(baton->buffer_in, baton->buffer_in_len, &shrunk_on_load, "shrink", shrink_on_load, NULL)) {
+      if (shrink >= 8) {
-        return resize_error(baton, in);
+        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 = 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 {
-      if (vips_jpegload((baton->file_in).c_str(), &shrunk_on_load, "shrink", shrink_on_load, NULL)) {
+      vips_copy(in, &shrunk_on_load, NULL);
-        return resize_error(baton, in);
-      }
     }
-  } else {
+    g_object_unref(in);
-    vips_copy(in, &shrunk_on_load, NULL);
-  }
-  g_object_unref(in);
 
-  VipsImage *shrunk = vips_image_new();
+    VipsImage *shrunk = vips_image_new();
-  if (shrink > 1) {
+    if (shrink > 1) {
-    // Use vips_shrink with the integral reduction
+      // Use vips_shrink with the integral reduction
-    if (vips_shrink(shrunk_on_load, &shrunk, shrink, shrink, NULL)) {
+      if (vips_shrink(shrunk_on_load, &shrunk, shrink, shrink, NULL)) {
-      return resize_error(baton, shrunk_on_load);
+        return resize_error(baton, shrunk_on_load);
-    }
-  } else {
-    vips_copy(shrunk_on_load, &shrunk, NULL);
-  }
-  g_object_unref(shrunk_on_load);
-
-  // Use vips_affine with the remaining float part using bilinear interpolation
-  VipsImage *affined = vips_image_new();
-  if (residual != 0) {
-    if (vips_affine(shrunk, &affined, residual, 0, 0, residual, "interpolate", vips_interpolate_bilinear_static(), NULL)) {
-      return resize_error(baton, shrunk);
-    }
-  } else {
-    vips_copy(shrunk, &affined, NULL);
-  }
-  g_object_unref(shrunk);
-
-  // Crop/embed
-  VipsImage *canvased = vips_image_new();
-  if (affined->Xsize != baton->width || affined->Ysize != baton->height) {
-    if (baton->crop) {
-      // Crop
-      int width = std::min(affined->Xsize, baton->width);
-      int height = std::min(affined->Ysize, baton->height);
-      int left = (affined->Xsize - width + 1) / 2;
-      int top = (affined->Ysize - height + 1) / 2;
-      if (vips_extract_area(affined, &canvased, left, top, width, height, NULL)) {
-        return resize_error(baton, affined);
       }
     } else {
-      // Embed
+      vips_copy(shrunk_on_load, &shrunk, NULL);
-      int left = (baton->width - affined->Xsize) / 2;
+    }
-      int top = (baton->height - affined->Ysize) / 2;
+    g_object_unref(shrunk_on_load);
-      if (vips_embed(affined, &canvased, left, top, baton->width, baton->height, "extend", baton->extend, NULL)) {
+
-        return resize_error(baton, affined);
+    // Use vips_affine with the remaining float part using bilinear interpolation
+    VipsImage *affined = vips_image_new();
+    if (residual != 0) {
+      if (vips_affine(shrunk, &affined, residual, 0, 0, residual, "interpolate", vips_interpolate_bilinear_static(), NULL)) {
+        return resize_error(baton, shrunk);
       }
+    } else {
+      vips_copy(shrunk, &affined, NULL);
     }
-  } else {
+    g_object_unref(shrunk);
-    vips_copy(affined, &canvased, NULL);
-  }
-  g_object_unref(affined);
 
-  // Mild sharpen
+    // Crop/embed
-  VipsImage *sharpened = vips_image_new();
+    VipsImage *canvased = vips_image_new();
-  if (baton->sharpen) {
+    if (affined->Xsize != baton->width || affined->Ysize != baton->height) {
-    INTMASK* sharpen = im_create_imaskv("sharpen", 3, 3,
+      if (baton->crop) {
-      -1, -1, -1,
+        // Crop
-      -1, 32, -1,
+        int width = std::min(affined->Xsize, baton->width);
-      -1, -1, -1);
+        int height = std::min(affined->Ysize, baton->height);
-    sharpen->scale = 24;
+        int left = (affined->Xsize - width + 1) / 2;
-    if (im_conv(canvased, sharpened, sharpen)) {
+        int top = (affined->Ysize - height + 1) / 2;
-      return resize_error(baton, canvased);
+        if (vips_extract_area(affined, &canvased, left, top, width, height, NULL)) {
+          return resize_error(baton, affined);
+        }
+      } else {
+        // Embed
+        int left = (baton->width - affined->Xsize) / 2;
+        int top = (baton->height - affined->Ysize) / 2;
+        if (vips_embed(affined, &canvased, left, top, baton->width, baton->height, "extend", baton->extend, NULL)) {
+          return resize_error(baton, affined);
+        }
+      }
+    } else {
+      vips_copy(affined, &canvased, NULL);
     }
-  } else {
+    g_object_unref(affined);
-    vips_copy(canvased, &sharpened, NULL);
-  }
-  g_object_unref(canvased);
 
-  // Output
+    // Mild sharpen
-  if (baton->file_out == "__jpeg" || (baton->file_out == "__input" && inputImageType == JPEG)) {
+    VipsImage *sharpened = vips_image_new();
-    // Write JPEG to buffer
+    if (baton->sharpen) {
-    if (vips_jpegsave_buffer(sharpened, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "Q", 80, "optimize_coding", TRUE, "interlace", baton->progessive, NULL)) {
+      INTMASK* sharpen = im_create_imaskv("sharpen", 3, 3,
-      return resize_error(baton, sharpened);
+        -1, -1, -1,
+        -1, 32, -1,
+        -1, -1, -1);
+      sharpen->scale = 24;
+      if (im_conv(canvased, sharpened, sharpen)) {
+        return resize_error(baton, canvased);
+      }
+    } else {
+      vips_copy(canvased, &sharpened, NULL);
     }
-  } else if (baton->file_out == "__png" || (baton->file_out == "__input" && inputImageType == PNG)) {
+    g_object_unref(canvased);
-    // Write PNG to buffer
-    if (vips_pngsave_buffer(sharpened, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "compression", 6, "interlace", baton->progessive, NULL)) {
-      return resize_error(baton, sharpened);
-    }
-  } else if (baton->file_out == "__webp" || (baton->file_out == "__input" && inputImageType == WEBP)) {
-    // Write WEBP to buffer
-    if (vips_webpsave_buffer(sharpened, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "Q", 80, NULL)) {
-      return resize_error(baton, sharpened);
-    }
-  } else if (is_jpeg(baton->file_out))  {
-    // Write JPEG to file
-    if (vips_jpegsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "Q", 80, "optimize_coding", TRUE, "interlace", baton->progessive, NULL)) {
-      return resize_error(baton, sharpened);
-    }
-  } else if (is_png(baton->file_out)) {
-    // Write PNG to file
-    if (vips_pngsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "compression", 6, "interlace", baton->progessive, NULL)) {
-      return resize_error(baton, sharpened);
-    }
-  } else if (is_webp(baton->file_out)) {
-    // Write WEBP to file
-    if (vips_webpsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "Q", 80, NULL)) {
-      return resize_error(baton, sharpened);
-    }
-  } else if (is_tiff(baton->file_out)) {
-    // Write TIFF to file
-    if (vips_tiffsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "compression", VIPS_FOREIGN_TIFF_COMPRESSION_JPEG, "Q", 80, NULL)) {
-      return resize_error(baton, sharpened);
-    }
-  } else {
-    (baton->err).append("Unsupported output " + baton->file_out);
-  }
-  g_object_unref(sharpened);
-  vips_thread_shutdown();
-}
 
-void resize_async_after(uv_work_t *work, int status) {
+    // Output
-  HandleScope scope;
+    if (baton->file_out == "__jpeg" || (baton->file_out == "__input" && inputImageType == JPEG)) {
-
+      // Write JPEG to buffer
-  resize_baton *baton = static_cast<resize_baton*>(work->data);
+      if (vips_jpegsave_buffer(sharpened, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "Q", 80, "optimize_coding", TRUE, "interlace", baton->progessive, NULL)) {
-
+        return resize_error(baton, sharpened);
-  Handle<Value> argv[2] = { Null(), Null() };
+      }
-  if (!baton->err.empty()) {
+    } else if (baton->file_out == "__png" || (baton->file_out == "__input" && inputImageType == PNG)) {
-    // Error
+      // Write PNG to buffer
-    argv[0] = scope.Close(String::New(baton->err.data(), baton->err.size()));
+      if (vips_pngsave_buffer(sharpened, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "compression", 6, "interlace", baton->progessive, NULL)) {
-  } else if (baton->buffer_out_len > 0) {
+        return resize_error(baton, sharpened);
-    // Buffer
+      }
-    Buffer *slowBuffer = Buffer::New(baton->buffer_out_len);
+    } else if (baton->file_out == "__webp" || (baton->file_out == "__input" && inputImageType == WEBP)) {
-    memcpy(Buffer::Data(slowBuffer), baton->buffer_out, baton->buffer_out_len);
+      // Write WEBP to buffer
-    Local<Object> globalObj = Context::GetCurrent()->Global();
+      if (vips_webpsave_buffer(sharpened, &baton->buffer_out, &baton->buffer_out_len, "strip", TRUE, "Q", 80, NULL)) {
-    Local<Function> bufferConstructor = Local<Function>::Cast(globalObj->Get(String::New("Buffer")));
+        return resize_error(baton, sharpened);
-    Handle<Value> constructorArgs[3] = { slowBuffer->handle_, v8::Integer::New(baton->buffer_out_len), v8::Integer::New(0) };
+      }
-    argv[1] = scope.Close(bufferConstructor->NewInstance(3, constructorArgs));
+    } else if (is_jpeg(baton->file_out))  {
-    g_free(baton->buffer_out);
+      // Write JPEG to file
+      if (vips_jpegsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "Q", 80, "optimize_coding", TRUE, "interlace", baton->progessive, NULL)) {
+        return resize_error(baton, sharpened);
+      }
+    } else if (is_png(baton->file_out)) {
+      // Write PNG to file
+      if (vips_pngsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "compression", 6, "interlace", baton->progessive, NULL)) {
+        return resize_error(baton, sharpened);
+      }
+    } else if (is_webp(baton->file_out)) {
+      // Write WEBP to file
+      if (vips_webpsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "Q", 80, NULL)) {
+        return resize_error(baton, sharpened);
+      }
+    } else if (is_tiff(baton->file_out)) {
+      // Write TIFF to file
+      if (vips_tiffsave(sharpened, baton->file_out.c_str(), "strip", TRUE, "compression", VIPS_FOREIGN_TIFF_COMPRESSION_JPEG, "Q", 80, NULL)) {
+        return resize_error(baton, sharpened);
+      }
+    } else {
+      (baton->err).append("Unsupported output " + baton->file_out);
+    }
+    g_object_unref(sharpened);
+    vips_thread_shutdown();
   }
 
-  baton->callback->Call(Context::GetCurrent()->Global(), 2, argv);
+  void HandleOKCallback () {
-  baton->callback.Dispose();
+    NanScope();
-  delete baton;
-  delete work;
-}
 
-Handle<Value> resize(const Arguments& args) {
+    Handle<Value> argv[2] = { Null(), Null() };
-  HandleScope scope;
+    if (!baton->err.empty()) {
+      // Error
+      argv[0] = String::New(baton->err.data(), baton->err.size());
+    } else if (baton->buffer_out_len > 0) {
+      // Buffer
+      argv[1] = NanNewBufferHandle((char *)baton->buffer_out, baton->buffer_out_len);
+      g_free(baton->buffer_out);
+    }
+    delete baton;
+    callback->Call(2, argv);
+  }
+
+ private:
+  resize_baton* baton;
+};
+
+NAN_METHOD(resize) {
+  NanScope();
   
   resize_baton *baton = new resize_baton;
   baton->file_in = *String::Utf8Value(args[0]->ToString());
@@ -338,16 +343,15 @@ Handle<Value> resize(const Arguments& args) {
   baton->sharpen = args[6]->BooleanValue();
   baton->progessive = args[7]->BooleanValue();
   baton->access_method = args[8]->BooleanValue() ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
-  baton->callback = Persistent<Function>::New(Local<Function>::Cast(args[9]));
 
-  uv_work_t *work = new uv_work_t;
+  NanCallback *callback = new NanCallback(args[9].As<v8::Function>());
-  work->data = baton;
+
-  uv_queue_work(uv_default_loop(), work, resize_async, (uv_after_work_cb)resize_async_after);
+  NanAsyncQueueWorker(new ResizeWorker(callback, baton));
-  return scope.Close(Undefined());
+  NanReturnUndefined();
 }
 
-Handle<Value> cache(const Arguments& args) {
+NAN_METHOD(cache) {
-  HandleScope scope;
+  NanScope();
   
   // Set cache limit
   if (args[0]->IsInt32()) {
@@ -359,16 +363,16 @@ Handle<Value> cache(const Arguments& args) {
   cache->Set(String::NewSymbol("current"), Number::New(vips_tracked_get_mem() / 1048576));
   cache->Set(String::NewSymbol("high"), Number::New(vips_tracked_get_mem_highwater() / 1048576));
   cache->Set(String::NewSymbol("limit"), Number::New(vips_cache_get_max_mem() / 1048576));
-  return scope.Close(cache);
+  NanReturnValue(cache);
 }
 
 static void at_exit(void* arg) {
-  HandleScope scope;
+  NanScope();
   vips_shutdown();
 }
 
 extern "C" void init(Handle<Object> target) {
-  HandleScope scope;
+  NanScope();
   vips_init("");
   AtExit(at_exit);
   NODE_SET_METHOD(target, "resize", resize);

tests/parallel.js

@@ -1,9 +1,10 @@
 var sharp = require("../index");
 var fs = require("fs");
+var path = require("path");
 var assert = require("assert");
 var async = require("async");
 
-var inputJpg = __dirname + "/2569067123_aca715a2ee_o.jpg"; // http://www.flickr.com/photos/grizdave/2569067123/
+var inputJpg = path.join(__dirname, "fixtures/2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/
 var width = 720;
 var height = 480;
 

tests/perf.js

@@ -1,31 +1,39 @@
 var sharp = require("../index");
 var fs = require("fs");
+var path = require("path");
 var imagemagick = require("imagemagick");
+var imagemagickNative = require("imagemagick-native");
 var gm = require("gm");
-var epeg = require("epeg");
 var async = require("async");
 var assert = require("assert");
 var Benchmark = require("benchmark");
 
-var inputJpg = __dirname + "/2569067123_aca715a2ee_o.jpg"; // http://www.flickr.com/photos/grizdave/2569067123/
+var fixturesPath = path.join(__dirname, "fixtures");
-var outputJpg = __dirname + "/output.jpg";
 
-var inputPng = __dirname + "/50020484-00001.png"; // http://c.searspartsdirect.com/lis_png/PLDM/50020484-00001.png
+var inputJpg = path.join(fixturesPath, "2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/
-var outputPng = __dirname + "/output.png";
+var outputJpg = path.join(fixturesPath, "output.jpg");
 
-var inputWebp = __dirname + "/4.webp"; // http://www.gstatic.com/webp/gallery/4.webp
+var inputPng = path.join(fixturesPath, "50020484-00001.png"); // http://c.searspartsdirect.com/lis_png/PLDM/50020484-00001.png
-var outputWebp = __dirname + "/output.webp";
+var outputPng = path.join(fixturesPath, "output.png");
 
-var inputTiff = __dirname + "/G31D.TIF"; // http://www.fileformat.info/format/tiff/sample/e6c9a6e5253348f4aef6d17b534360ab/index.htm
+var inputWebp = path.join(fixturesPath, "4.webp"); // http://www.gstatic.com/webp/gallery/4.webp
-var outputTiff = __dirname + "/output.tiff";
+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;
 
+// Disable libvips cache to ensure tests are as fair as they can be
+sharp.cache(0);
+
 async.series({
   jpeg: function(callback) {
     var inputJpgBuffer = fs.readFileSync(inputJpg);
-    (new Benchmark.Suite("jpeg")).add("imagemagick", {
+    (new Benchmark.Suite("jpeg")).add("imagemagick-file-file", {
       defer: true,
       fn: function(deferred) {
         imagemagick.resize({
@@ -42,6 +50,41 @@ async.series({
           }
         });
       }
+    }).add("imagemagick-native-buffer-buffer", {
+      defer: true,
+      fn: function(deferred) {
+        imagemagickNative.convert({
+          srcData: inputJpgBuffer,
+          quality: 80,
+          width: width,
+          height: height,
+					format: 'JPEG'
+        });
+				deferred.resolve();
+      }
+    }).add("gm-buffer-file", {
+      defer: true,
+      fn: function(deferred) {
+        gm(inputJpgBuffer).resize(width, height).quality(80).write(outputJpg, function (err) {
+          if (err) {
+            throw err;
+          } else {
+            deferred.resolve();
+          }
+        });
+      }
+    }).add("gm-buffer-buffer", {
+      defer: true,
+      fn: function(deferred) {
+        gm(inputJpgBuffer).resize(width, height).quality(80).toBuffer(function (err, buffer) {
+          if (err) {
+            throw err;
+          } else {
+            assert.notStrictEqual(null, buffer);
+            deferred.resolve();
+          }
+        });
+      }
     }).add("gm-file-file", {
       defer: true,
       fn: function(deferred) {
@@ -65,21 +108,6 @@ async.series({
           }
         });
       }
-    }).add("epeg-file-file", {
-      defer: true,
-      fn: function(deferred) {
-        var image = new epeg.Image({path: inputJpg});
-        image.downsize(width, height, 80).saveTo(outputJpg);
-        deferred.resolve();
-      }
-    }).add("epeg-file-buffer", {
-      defer: true,
-      fn: function(deferred) {
-        var image = new epeg.Image({path: inputJpg});
-        var buffer = image.downsize(width, height, 80).process();
-        assert.notStrictEqual(null, buffer);
-        deferred.resolve();
-      }
     }).add("sharp-buffer-file", {
       defer: true,
       fn: function(deferred) {
@@ -170,7 +198,7 @@ async.series({
   },
   png: function(callback) {
     var inputPngBuffer = fs.readFileSync(inputPng);
-    (new Benchmark.Suite("png")).add("imagemagick", {
+    (new Benchmark.Suite("png")).add("imagemagick-file-file", {
       defer: true,
       fn: function(deferred) {
         imagemagick.resize({
@@ -186,6 +214,17 @@ async.series({
           }
         });
       }
+    }).add("imagemagick-native-buffer-buffer", {
+      defer: true,
+      fn: function(deferred) {
+        imagemagickNative.convert({
+          srcData: inputPngBuffer,
+          width: width,
+          height: height,
+					format: 'PNG'
+        });
+				deferred.resolve();
+      }
     }).add("gm-file-file", {
       defer: true,
       fn: function(deferred) {
@@ -414,11 +453,53 @@ async.series({
     }).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).write(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().write(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).write(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) {
-    assert.strictEqual("sharp", results[format].toString().substr(0, 5), "sharp was slower than " + results[format] + " for " + format);
+    if (results[format].toString().substr(0, 5) !== "sharp") {
+      console.log("sharp was slower than " + results[format] + " for " + format);
+    }
   });
   console.dir(sharp.cache());
 });

tests/random.js

@@ -1,14 +1,15 @@
 var sharp = require("../index");
 var fs = require("fs");
+var path = require("path");
 var imagemagick = require("imagemagick");
 var gm = require("gm");
-var epeg = require("epeg");
 var async = require("async");
 var assert = require("assert");
 var Benchmark = require("benchmark");
 
-var inputJpg = __dirname + "/2569067123_aca715a2ee_o.jpg"; // http://www.flickr.com/photos/grizdave/2569067123/
+var fixturesPath = path.join(__dirname, "fixtures");
-var outputJpg = __dirname + "/output.jpg";
+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;
@@ -46,14 +47,6 @@ new Benchmark.Suite("random").add("imagemagick", {
 			}
 		});
 	}
-}).add("epeg", {
-	defer: true,
-	fn: function(deferred) {
-		var image = new epeg.Image({path: inputJpg});
-		var buffer = image.downsize(randomDimension(), randomDimension(), 80).process();
-		assert.notStrictEqual(null, buffer);
-		deferred.resolve();
-	}
 }).add("sharp", {
 	defer: true,
 	fn: function(deferred) {

tests/unit.js

@@ -1,10 +1,13 @@
 var sharp = require("../index");
+var path = require("path");
 var imagemagick = require("imagemagick");
 var assert = require("assert");
 var async = require("async");
 
-var inputJpg = __dirname + "/2569067123_aca715a2ee_o.jpg"; // http://www.flickr.com/photos/grizdave/2569067123/
+var fixturesPath = path.join(__dirname, "fixtures");
-var outputJpg = __dirname + "/output.jpg";
+
+var inputJpg = path.join(fixturesPath, "2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/
+var outputJpg = path.join(fixturesPath, "output.jpg");
 
 async.series([
   // Resize with exact crop