diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 040017cb..bc037b84 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,8 +41,9 @@ Any change that modifies the existing public API should be added to the relevant | Release | WIP branch | | ------: | :--------- | -| v0.13.0 | mind | | v0.14.0 | needle | +| v0.15.0 | outfit | +| v0.16.0 | pencil | Please squash your changes into a single commit using a command like `git rebase -i upstream/`. diff --git a/docs/performance.md b/docs/performance.md index 9bb9a08c..63e90594 100644 --- a/docs/performance.md +++ b/docs/performance.md @@ -4,16 +4,16 @@ * AWS EC2 [c4.xlarge](http://aws.amazon.com/ec2/instance-types/#c4) (4x E5-2666 v3 @2.90GHz) * Amazon Linux 2015.09.1 -* Node.js v5.1.0 +* Node.js v5.5.0 ### The contenders -* [jimp](https://www.npmjs.com/package/jimp) v0.2.19 - Image processing in pure JavaScript. Bilinear interpolation only. +* [jimp](https://www.npmjs.com/package/jimp) v0.2.20 - Image processing in pure JavaScript. Bilinear interpolation only. * [lwip](https://www.npmjs.com/package/lwip) v0.0.8 - Wrapper around CImg, compiles dependencies from source. -* [imagemagick-native](https://www.npmjs.com/package/imagemagick-native) @5ab570e - Wrapper around libmagick++, supports Buffers only. +* [imagemagick-native](https://www.npmjs.com/package/imagemagick-native) @47c7329 - Wrapper around libmagick++, supports Buffers only. * [imagemagick](https://www.npmjs.com/package/imagemagick) v0.1.3 - Supports filesystem only and "*has been unmaintained for a long time*". * [gm](https://www.npmjs.com/package/gm) v1.21.0 - Fully featured wrapper around GraphicsMagick's `gm` command line utility. -* sharp v0.12.0 / libvips v8.1.1 - Caching within libvips disabled to ensure a fair comparison. +* sharp v0.13.0 / libvips v8.2.2 - Caching within libvips disabled to ensure a fair comparison. ### The task @@ -23,19 +23,19 @@ Decompress a 2725x2225 JPEG image, resize to 720x480 using bicubic interpolation | Module | Input | Output | Ops/sec | Speed-up | | :----------------- | :----- | :----- | ------: | -------: | -| jimp | file | file | 0.99 | 1.0 | -| jimp | buffer | buffer | 1.05 | 1.1 | +| jimp (bilinear) | file | file | 1.04 | 1.0 | +| jimp (bilinear) | buffer | buffer | 1.07 | 1.0 | | lwip | file | file | 1.13 | 1.1 | | lwip | buffer | buffer | 1.13 | 1.1 | -| imagemagick-native | buffer | buffer | 1.67 | 1.7 | -| imagemagick | file | file | 5.19 | 5.2 | -| gm | buffer | buffer | 5.56 | 5.6 | -| gm | file | file | 5.59 | 5.6 | -| sharp | stream | stream | 21.91 | 22.1 | -| sharp | file | file | 22.79 | 23.0 | -| sharp | file | buffer | 22.91 | 23.1 | -| sharp | buffer | file | 23.03 | 23.3 | -| sharp | buffer | buffer | 23.15 | 23.4 | +| imagemagick-native | buffer | buffer | 1.65 | 1.6 | +| imagemagick | file | file | 5.02 | 4.8 | +| gm | buffer | buffer | 5.36 | 5.2 | +| gm | file | file | 5.39 | 5.2 | +| sharp | stream | stream | 22.00 | 21.2 | +| sharp | file | file | 22.87 | 22.0 | +| sharp | file | buffer | 23.03 | 22.1 | +| sharp | buffer | file | 23.10 | 22.2 | +| sharp | buffer | buffer | 23.21 | 22.3 | Greater performance can be expected with caching enabled (default) and using 8+ core machines. diff --git a/packaging/test/alpine.sh b/packaging/test/alpine.sh index ab8a4a32..b14ed858 100755 --- a/packaging/test/alpine.sh +++ b/packaging/test/alpine.sh @@ -4,4 +4,4 @@ apk add --update make gcc g++ python nodejs # Install libvips dependencies -apk add --update glib-dev libpng-dev libwebp-dev libexif-dev libxml2-dev orc-dev fftw-dev lcms2-dev +apk add --update glib-dev libpng libwebp libexif libxml2 orc fftw lcms2