Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-12-19 07:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure conv kernel scale is clamped to min val of 1 #561

Browse Source
This commit is contained in:
Lovell Fuller
2016-09-03 20:06:49 +01:00
parent 7c06a48ec0
commit af9d09f8ae
4 changed files with 75 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/fixtures/expected/conv-sobel-horizontal.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

102
test/unit/convolve.js
View File

@@ -9,18 +9,17 @@ describe('Convolve', function() {
it('specific convolution kernel 1', function(done) {
sharp(fixtures.inputPngStripesV)
.resize(320, 240)
.convolve(
{
'width': 3,
'height': 3,
'scale': 50,
'offset': 0,
'kernel': [ 10, 20, 10,
0, 0, 0,
10, 20, 10 ]
})
.convolve({
width: 3,
height: 3,
scale: 50,
offset: 0,
kernel: [ 10, 20, 10,
0, 0, 0,
10, 20, 10 ]
})
.toBuffer(function(err, data, info) {
if (err) throw err;
assert.strictEqual('png', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
@@ -30,16 +29,15 @@ describe('Convolve', function() {
it('specific convolution kernel 2', function(done) {
sharp(fixtures.inputPngStripesH)
.resize(320, 240)
.convolve(
{
'width': 3,
'height': 3,
'kernel': [ 1, 0, 1,
2, 0, 2,
1, 0, 1 ]
})
.convolve({
width: 3,
height: 3,
kernel: [ 1, 0, 1,
2, 0, 2,
1, 0, 1 ]
})
.toBuffer(function(err, data, info) {
if (err) throw err;
assert.strictEqual('png', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
@@ -47,36 +45,48 @@ describe('Convolve', function() {
});
});
it('invalid kernel specification: no data', function() {
assert.throws(function() {
sharp(fixtures.inputJpg).convolve(
{
'width': 3,
'height': 3,
'kernel': []
});
});
it('horizontal Sobel operator', function(done) {
sharp(fixtures.inputJpg)
.resize(320, 240)
.convolve({
width: 3,
height: 3,
kernel: [ -1, 0, 1,
-2, 0, 2,
-1, 0, 1 ]
})
.toBuffer(function(err, data, info) {
if (err) throw err;
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
fixtures.assertSimilar(fixtures.expected('conv-sobel-horizontal.jpg'), data, done);
});
});
it('invalid kernel specification: bad data format', function() {
assert.throws(function() {
sharp(fixtures.inputJpg).convolve(
{
'width': 3,
'height': 3,
'kernel': [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
});
describe('invalid kernel specification', function() {
it('missing', function() {
assert.throws(function() {
sharp(fixtures.inputJpg).convolve({});
});
});
});
it('invalid kernel specification: wrong width', function() {
assert.throws(function() {
sharp(fixtures.inputJpg).convolve(
{
'width': 3,
'height': 4,
'kernel': [1, 2, 3, 4, 5, 6, 7, 8, 9]
it('incorrect data format', function() {
assert.throws(function() {
sharp(fixtures.inputJpg).convolve({
width: 3,
height: 3,
kernel: [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
});
});
});
it('incorrect dimensions', function() {
assert.throws(function() {
sharp(fixtures.inputJpg).convolve({
width: 3,
height: 4,
kernel: [1, 2, 3, 4, 5, 6, 7, 8, 9]
});
});
});
});
});