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

Ensure 16-bit input images work with embed option #325

Browse Source
This commit is contained in:
Lovell Fuller 2015-12-23 20:46:49 +00:00
parent fd5b4a131f
commit 61b86744d7
5 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changelog.md
View File

@ -2,6 +2,12 @@
### v0.12 - "*look*"
#### v0.12.2 - TBD
* Ensure 16-bit input images work with embed option.
[#325](https://github.com/lovell/sharp/issues/325)
[@janaz](https://github.com/janaz)
#### v0.12.1 - 12<sup>th</sup> December 2015
* Allow use of SIMD vector instructions (via liborc) to be toggled on/off.

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "sharp",
"version": "0.12.1",
"version": "0.12.2",
"author": "Lovell Fuller <npm@lovell.info>",
"contributors": [
"Pierre Inglebert <pierre.inglebert@gmail.com>",

27
src/pipeline.cc
View File

@ -627,16 +627,6 @@ class PipelineWorker : public AsyncWorker {
// Crop/embed
if (image->Xsize != baton->width || image->Ysize != baton->height) {
if (baton->canvas == Canvas::EMBED) {
// Match background colour space, namely sRGB
if (image->Type != VIPS_INTERPRETATION_sRGB) {
// Convert to sRGB colour space
VipsImage *colourspaced;
if (vips_colourspace(image, &colourspaced, VIPS_INTERPRETATION_sRGB, nullptr)) {
return Error();
}
vips_object_local(hook, colourspaced);
image = colourspaced;
}
// Add non-transparent alpha channel, if required
if (baton->background[3] < 255.0 && !HasAlpha(image)) {
// Create single-channel transparency
@ -661,13 +651,22 @@ class PipelineWorker : public AsyncWorker {
}
// Create background
VipsArrayDouble *background;
// Scale up 8-bit values to match 16-bit input image
double multiplier = (image->Type == VIPS_INTERPRETATION_RGB16) ? 256.0 : 1.0;
if (baton->background[3] < 255.0 || HasAlpha(image)) {
background = vips_array_double_newv(
4, baton->background[0], baton->background[1], baton->background[2], baton->background[3]
// RGBA
background = vips_array_double_newv(4,
baton->background[0] * multiplier,
baton->background[1] * multiplier,
baton->background[2] * multiplier,
baton->background[3] * multiplier
);
} else {
background = vips_array_double_newv(
3, baton->background[0], baton->background[1], baton->background[2]
// RGB
background = vips_array_double_newv(3,
baton->background[0] * multiplier,
baton->background[1] * multiplier,
baton->background[2] * multiplier
);
}
// Embed

BIN
test/fixtures/expected/embed-16bit.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 827 B

14
test/unit/embed.js
View File

@ -68,6 +68,20 @@ describe('Embed', function() {
});
});
it('16-bit PNG with alpha channel', function(done) {
sharp(fixtures.inputPngWithTransparency16bit)
.resize(32, 16)
.embed()
.toBuffer(function(err, data, info) {
if (err) throw err;
assert.strictEqual(true, data.length > 0);
assert.strictEqual('png', info.format);
assert.strictEqual(32, info.width);
assert.strictEqual(16, info.height);
fixtures.assertSimilar(fixtures.expected('embed-16bit.png'), data, done);
});
});
it('Enlarge and embed', function(done) {
sharp(fixtures.inputPngWithOneColor)
.embed()