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 keepIccProfile retains CMYK input profiles #3906

Browse Source
This commit is contained in:
Lovell Fuller 2024-02-11 20:10:18 +00:00
parent fc439bedf1
commit fb70fbb09f
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changelog.md
View File

@ -4,6 +4,11 @@
Requires libvips v8.15.1 Requires libvips v8.15.1
### v0.33.3 - TBD
* Ensure `keepIccProfile` retains CMYK input profiles.
[#3906](https://github.com/lovell/sharp/issues/3906)
### v0.33.2 - 12th January 2024 ### v0.33.2 - 12th January 2024
* Upgrade to libvips v8.15.1 for upstream bug fixes. * Upgrade to libvips v8.15.1 for upstream bug fixes.

2
src/pipeline.cc
View File

@ -776,7 +776,7 @@ class PipelineWorker : public Napi::AsyncWorker {
// Convert colourspace, pass the current known interpretation so libvips doesn't have to guess // Convert colourspace, pass the current known interpretation so libvips doesn't have to guess
image = image.colourspace(baton->colourspace, VImage::option()->set("source_space", image.interpretation())); image = image.colourspace(baton->colourspace, VImage::option()->set("source_space", image.interpretation()));
// Transform colours from embedded profile to output profile // Transform colours from embedded profile to output profile
if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) && if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) && baton->colourspaceInput != VIPS_INTERPRETATION_CMYK &&
baton->withIccProfile.empty() && sharp::HasProfile(image)) { baton->withIccProfile.empty() && sharp::HasProfile(image)) {
image = image.icc_transform("srgb", VImage::option() image = image.icc_transform("srgb", VImage::option()
->set("embedded", TRUE) ->set("embedded", TRUE)

13
test/unit/metadata.js
View File

@ -576,6 +576,19 @@ describe('Image metadata', function () {
assert.strictEqual(description, 'Generic RGB Profile'); assert.strictEqual(description, 'Generic RGB Profile');
}); });
it('keep existing CMYK ICC profile', async () => {
const data = await sharp(fixtures.inputJpgWithCmykProfile)
.pipelineColourspace('cmyk')
.toColourspace('cmyk')
.keepIccProfile()
.toBuffer();
const metadata = await sharp(data).metadata();
assert.strictEqual(metadata.channels, 4);
const { description } = icc.parse(metadata.icc);
assert.strictEqual(description, 'U.S. Web Coated (SWOP) v2');
});
it('transform to ICC profile and attach', async () => { it('transform to ICC profile and attach', async () => {
const data = await sharp({ create }) const data = await sharp({ create })
.png() .png()