Update bench to latest imagemagick-native

Use 'Triangle' filter as bilinear equiv.
This commit is contained in:
Lovell Fuller 2015-02-02 16:16:45 +00:00
parent e5a5e2ca7e
commit f57478c1aa
2 changed files with 19 additions and 10 deletions

View File

@ -9,7 +9,7 @@
}, },
"devDependencies": { "devDependencies": {
"imagemagick": "^0.1.3", "imagemagick": "^0.1.3",
"imagemagick-native": "^1.6.0", "imagemagick-native": "^1.7.0",
"gm": "^1.17.0", "gm": "^1.17.0",
"async": "^0.9.0", "async": "^0.9.0",
"semver": "^4.2.0", "semver": "^4.2.0",

View File

@ -11,6 +11,9 @@ var fixtures = require('../fixtures');
var min = 320; var min = 320;
var max = 960; var max = 960;
// Nearest equivalent to bilinear
var magickFilter = 'Triangle';
var randomDimension = function() { var randomDimension = function() {
return Math.ceil(Math.random() * (max - min) + min); return Math.ceil(Math.random() * (max - min) + min);
}; };
@ -23,7 +26,9 @@ new Benchmark.Suite('random').add('imagemagick', {
dstPath: fixtures.outputJpg, dstPath: fixtures.outputJpg,
quality: 0.8, quality: 0.8,
width: randomDimension(), width: randomDimension(),
height: randomDimension() height: randomDimension(),
format: 'jpg',
filter: magickFilter
}, function(err) { }, function(err) {
if (err) { if (err) {
throw err; throw err;
@ -35,14 +40,18 @@ new Benchmark.Suite('random').add('imagemagick', {
}).add('gm', { }).add('gm', {
defer: true, defer: true,
fn: function(deferred) { fn: function(deferred) {
gm(fixtures.inputJpg).resize(randomDimension(), randomDimension()).quality(80).toBuffer(function (err, buffer) { gm(fixtures.inputJpg)
if (err) { .resize(randomDimension(), randomDimension())
throw err; .filter(magickFilter)
} else { .quality(80)
assert.notStrictEqual(null, buffer); .toBuffer(function (err, buffer) {
deferred.resolve(); if (err) {
} throw err;
}); } else {
assert.notStrictEqual(null, buffer);
deferred.resolve();
}
});
} }
}).add('sharp', { }).add('sharp', {
defer: true, defer: true,