Update benchmark deps, allow node-images to fail

This commit is contained in:
Lovell Fuller 2017-07-14 13:18:13 +01:00
parent d6051dd714
commit d25d761b55
2 changed files with 24 additions and 15 deletions

View File

@ -8,14 +8,14 @@
"test": "node perf && node random && node parallel" "test": "node perf && node random && node parallel"
}, },
"devDependencies": { "devDependencies": {
"async": "^2.1.4", "async": "^2.5.0",
"benchmark": "^2.1.2", "benchmark": "^2.1.4",
"gm": "^1.23.0", "gm": "^1.23.0",
"imagemagick": "^0.1.3", "imagemagick": "^0.1.3",
"imagemagick-native": "^1.9.3", "imagemagick-native": "^1.9.3",
"images": "^3.0.0", "images": "^3.0.0",
"jimp": "^0.2.27", "jimp": "^0.2.28",
"mapnik": "^3.6.0", "mapnik": "^3.6.2",
"pajk-lwip": "^0.2.0", "pajk-lwip": "^0.2.0",
"semver": "^5.3.0" "semver": "^5.3.0"
}, },

View File

@ -12,7 +12,12 @@ const gm = require('gm');
const imagemagick = require('imagemagick'); const imagemagick = require('imagemagick');
const mapnik = require('mapnik'); const mapnik = require('mapnik');
const jimp = require('jimp'); const jimp = require('jimp');
const images = require('images'); let images;
try {
images = require('images');
} catch (err) {
console.log('Excluding node-images');
}
let imagemagickNative; let imagemagickNative;
try { try {
imagemagickNative = require('imagemagick-native'); imagemagickNative = require('imagemagick-native');
@ -268,11 +273,13 @@ async.series({
} }
}); });
// images // images
jpegSuite.add('images-file-file', function () { if (typeof images !== 'undefined') {
images(fixtures.inputJpg) jpegSuite.add('images-file-file', function () {
.resize(width, height) images(fixtures.inputJpg)
.save(fixtures.outputJpg, { quality: 80 }); .resize(width, height)
}); .save(fixtures.outputJpg, { quality: 80 });
});
}
// sharp // sharp
jpegSuite.add('sharp-buffer-file', { jpegSuite.add('sharp-buffer-file', {
defer: true, defer: true,
@ -827,11 +834,13 @@ async.series({
} }
}); });
// images // images
pngSuite.add('images-file-file', function () { if (typeof images !== 'undefined') {
images(fixtures.inputPng) pngSuite.add('images-file-file', function () {
.resize(width, height) images(fixtures.inputPng)
.save(fixtures.outputPng); .resize(width, height)
}); .save(fixtures.outputPng);
});
}
// sharp // sharp
pngSuite.add('sharp-buffer-file', { pngSuite.add('sharp-buffer-file', {
defer: true, defer: true,