Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-09 10:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Recalculate residual after adjusting shrink #831

Browse Source
This commit is contained in:
Lovell Fuller 2017-05-30 20:22:15 +01:00
parent 9e39a7fa95
commit f42a1ceab7
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pipeline.cc
View File

@ -291,8 +291,8 @@ class PipelineWorker : public Nan::AsyncWorker {
if (xshrink > 1 && yshrink > 1 && (xresidual == 1.0 || yresidual == 1.0)) { if (xshrink > 1 && yshrink > 1 && (xresidual == 1.0 || yresidual == 1.0)) {
xshrink = xshrink / 2; xshrink = xshrink / 2;
yshrink = yshrink / 2; yshrink = yshrink / 2;
xresidual = xresidual / 2.0; xresidual = static_cast<double>(xshrink) / xfactor;
yresidual = yresidual / 2.0; yresidual = static_cast<double>(yshrink) / yfactor;
} }
// Ensure we're using a device-independent colour space // Ensure we're using a device-independent colour space

BIN
test/fixtures/expected/resize-diff-shrink-even.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
test/fixtures/expected/resize-diff-shrink-odd.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

37
test/unit/resize.js
View File

@ -413,14 +413,39 @@ describe('Resize dimensions', function () {
}); });
}); });
it('Dimensions that result in differing shrinks on each axis', function () { it('Dimensions that result in differing even shrinks on each axis', function (done) {
return sharp(fixtures.inputJpg) sharp(fixtures.inputJpg)
.resize(645, 399) .resize(645, 399)
.toBuffer() .toBuffer(function (err, data, info) {
.then(function (data) { if (err) throw err;
return sharp(data) assert.strictEqual(645, info.width);
assert.strictEqual(399, info.height);
sharp(data)
.resize(150, 100) .resize(150, 100)
.toBuffer(); .toBuffer(function (err, data, info) {
if (err) throw err;
assert.strictEqual(150, info.width);
assert.strictEqual(100, info.height);
fixtures.assertSimilar(fixtures.expected('resize-diff-shrink-even.jpg'), data, done);
});
});
});
it('Dimensions that result in differing odd shrinks on each axis', function (done) {
return sharp(fixtures.inputJpg)
.resize(600, 399)
.toBuffer(function (err, data, info) {
if (err) throw err;
assert.strictEqual(600, info.width);
assert.strictEqual(399, info.height);
sharp(data)
.resize(200)
.toBuffer(function (err, data, info) {
if (err) throw err;
assert.strictEqual(200, info.width);
assert.strictEqual(133, info.height);
fixtures.assertSimilar(fixtures.expected('resize-diff-shrink-odd.jpg'), data, done);
});
}); });
}); });
}); });