Fix color management by keeping ICC color profiles and EXIF data in addition #136

andre-fuchs · 2023-11-02T16:50:59Z

Adds methods to keep the ICC color profile and EXIF data if supported for JPEG, PNG, WebP and AVIF file formats. Extends the unit tests accordingly. All tests passed.

Closes #114
Closes #137

…from the original image. Add first tests for these methods using a photo of a color checker with two different ICC profiles. Image source of the sRGB version: https://en.wikipedia.org/wiki/ColorChecker#/media/File:Gretag-Macbeth_ColorChecker.jpg

…data(). Add sanity check to save_as_jpeg() method for testing purposes

… not supoort color profiles

…ponding PIL.ImageOps operation

…from save_as_webp due to a lack of support

zerolab · 2023-11-02T17:09:05Z

@andre-fuchs thank you very much for this.

We use pre-commit with black/ruff, and is one of the testing dependencies - https://github.com/wagtail/Willow/blob/main/pyproject.toml#L44

Can you run pre-commit install then pre-commit run --all-files to lint?

andre-fuchs · 2023-11-02T17:24:23Z

Thanks @zerolab. Just did learn about pre-commit and reformatted the code.

Here is a quick summary of this update:

I added two methods to the class PillowImage() to add the ICC color profile and the EXIF data. These are applied in the methods save_as_jpeg(), save_as_png(), save_as_webp() and save_as_avif(). New unit tests were added to test this implementation with two image files with different ICC profiles.

This was strongly inspired by #63, which also modified the auto_orient() method. I think this was necessary to fix a bug caused by the Orientation EXIF tag. Not totally sure, though. Please double check if this is necessary.

Note: This workaround is not necessary anymore.

zerolab · 2023-11-06T15:17:14Z

Thank you @andre-fuchs. Will aim to review and test ASAP

Stormheg · 2023-11-19T21:05:41Z

The changes to auto_orient will also end up fixing #137.

Two birds with one stone!

Stormheg

LGTM!

zerolab

@andre-fuchs sorry for the delay. Lots of fantastic work here! Added a few notes on improving the API a bit.

Do let me know if you have the capacity to address these

willow/plugins/pillow.py

…to the save methods of the WandImage class as well. ICC color profiles do work with JPEG and WebP. EXIF data does work with JPEG only. Add unit tests.

willow/plugins/wand.py

…ddition (#136) * Add ICC profile and EXIF data methods to the PillowImage class Includes tests for these methods using a photo of a color checker with two different ICC profiles. Image source of the sRGB version: https://en.wikipedia.org/wiki/ColorChecker#/media/File:Gretag-Macbeth_ColorChecker.jpg * Modify the implementation of auto_orient() so that it uses the corresponding PIL.ImageOps operation * Add tests for save_as_ and auto_orient methods. * Add ICC profile and EXIF data methods to WandImage class as well. ICC color profiles do work with JPEG and WebP. EXIF data does work with JPEG only. Add unit tests. * Preserve EXIF data in PillowImage.save_as_png and WandImage.save_as_png Co-Authored-By: Ștefan Istrate <[email protected]>

andre-fuchs · 2023-11-27T11:29:36Z

Thanks @zerolab for tidying up!

zerolab · 2023-11-27T14:29:03Z

Thank you for helping us take this over the finish line, @andre-fuchs!
It has been way too long coming

andre-fuchs · 2023-11-27T14:41:06Z

Cannot wait to use it. Many of my clients were complaining about the color conversion in Wagtail. This should solve it.

Upgrading Wagtail via PIP doesn’t do the trick yet:
ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts. wagtail 5.2.1 requires Willow[heif]<1.7,>=1.6.2, but you have willow 1.7.0 which is incompatible.

laymonage · 2023-11-27T17:03:34Z

@andre-fuchs You can install version 1.6.3 instead: https://github.com/wagtail/Willow/releases/tag/v1.6.3. Wagtail's upper version boundary on Willow likely won't be updated until Wagtail 6.0 unless wagtail/wagtail#11272 is backported to the stable/5.2.x branch.

andre-fuchs added 9 commits November 2, 2023 12:52

Sanity Check

8dd408f

Fix the implementation of the methods add_icc_profile() and add_exif_…

89ae459

…data(). Add sanity check to save_as_jpeg() method for testing purposes

Fix the implementation of the methods add_icc_profile() and add_exif_…

c30415f

…data(). Add sanity check to save_as_jpeg() method for testing purposes

Fix the implementation of the methods add_icc_profile() and add_exif_…

ae116ab

…data(). Add sanity check to save_as_jpeg() method for testing purposes

Fix the missing kwargs unpacking. Tidying up

1195b63

Remove add_icc_profile() from save_as_gif(). The GIF file format does…

4d0dbb6

… not supoort color profiles

Modify the implementation of auto_orient() so that it uses the corres…

a39e211

…ponding PIL.ImageOps operation

Add tests for save_as_ and auto_orient methods. Remove add_exif_data …

7f605ba

…from save_as_webp due to a lack of support

Reformat code

fadd840

zerolab self-requested a review November 14, 2023 11:03

Stormheg mentioned this pull request Nov 19, 2023

Clean up auto_orient logic #138

Closed

Stormheg linked an issue Nov 19, 2023 that may be closed by this pull request

AVIF image saved with incorrect EXIF orientation metadata after calling auto_orient #137

Closed

Stormheg approved these changes Nov 19, 2023

View reviewed changes

zerolab mentioned this pull request Nov 21, 2023

AVIF image saved with incorrect EXIF orientation metadata after calling auto_orient #137

Closed

zerolab requested changes Nov 21, 2023

View reviewed changes

willow/plugins/pillow.py Outdated Show resolved Hide resolved

willow/plugins/pillow.py Outdated Show resolved Hide resolved

willow/plugins/pillow.py Show resolved Hide resolved

andre-fuchs added 2 commits November 22, 2023 11:27

Refactor ICC profile and EXIF data methods of the PillowImage class

19c5e4f

Add two methods to take over the ICC color profile and the EXIF data …

7ff65a1

…to the save methods of the WandImage class as well. ICC color profiles do work with JPEG and WebP. EXIF data does work with JPEG only. Add unit tests.

zerolab mentioned this pull request Nov 22, 2023

Relax the Willow upper version boundary wagtail/wagtail#11272

Merged

zerolab self-requested a review November 22, 2023 17:13

zerolab added 2 commits November 25, 2023 22:12

Preserve EXIF data in PillowImage.save_as_png

e47eda2

Preserve EXIF data when saving as PNG with Wand

5718d96

zerolab reviewed Nov 26, 2023

View reviewed changes

willow/plugins/wand.py Outdated Show resolved Hide resolved

Tidy up

251d02f

zerolab approved these changes Nov 26, 2023

View reviewed changes

zerolab merged commit 3f759f2 into wagtail:main Nov 26, 2023
7 checks passed

andre-fuchs deleted the fix-color-management branch November 27, 2023 11:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix color management by keeping ICC color profiles and EXIF data in addition #136

Fix color management by keeping ICC color profiles and EXIF data in addition #136

andre-fuchs commented Nov 2, 2023 •

edited by zerolab

Loading

zerolab commented Nov 2, 2023

andre-fuchs commented Nov 2, 2023 •

edited

Loading

zerolab commented Nov 6, 2023

Stormheg commented Nov 19, 2023

Stormheg left a comment

zerolab left a comment

andre-fuchs commented Nov 27, 2023

zerolab commented Nov 27, 2023

andre-fuchs commented Nov 27, 2023 •

edited

Loading

laymonage commented Nov 27, 2023 •

edited

Loading

Fix color management by keeping ICC color profiles and EXIF data in addition #136

Fix color management by keeping ICC color profiles and EXIF data in addition #136

Conversation

andre-fuchs commented Nov 2, 2023 • edited by zerolab Loading

zerolab commented Nov 2, 2023

andre-fuchs commented Nov 2, 2023 • edited Loading

Here is a quick summary of this update:

zerolab commented Nov 6, 2023

Stormheg commented Nov 19, 2023

Stormheg left a comment

Choose a reason for hiding this comment

zerolab left a comment

Choose a reason for hiding this comment

andre-fuchs commented Nov 27, 2023

zerolab commented Nov 27, 2023

andre-fuchs commented Nov 27, 2023 • edited Loading

laymonage commented Nov 27, 2023 • edited Loading

andre-fuchs commented Nov 2, 2023 •

edited by zerolab

Loading

andre-fuchs commented Nov 2, 2023 •

edited

Loading

andre-fuchs commented Nov 27, 2023 •

edited

Loading

laymonage commented Nov 27, 2023 •

edited

Loading