Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix overlay conversions #17102

Merged
merged 1 commit into from
Oct 14, 2024

Conversation

jenshannoschwalm
Copy link
Collaborator

@jenshannoschwalm jenshannoschwalm commented Jul 7, 2024

We don't want to do any colorspace conversion in the overlayed image.

Thus we

  • include colorin module in the "module filter out" list
  • we don't enforce colorin via it's commit_params if we develop with finalscale enabled.

See #17060

@TurboGit not completely sure about this yet thus WIP.

@jenshannoschwalm jenshannoschwalm added bugfix pull request fixing a bug priority: medium core features are degraded in a way that is still mostly usable, software stutters scope: image processing correcting pixels scope: color management ensuring consistency of colour adaptation through display/output profiles labels Jul 7, 2024
@jenshannoschwalm jenshannoschwalm marked this pull request as draft July 7, 2024 10:48
@jenshannoschwalm jenshannoschwalm force-pushed the overlay_colorspace branch 2 times, most recently from eec3b17 to d408bd5 Compare July 31, 2024 04:46
We don't want to do any colorspace conversion in the overlayed image.

Thus we
- include colorin module in the "module filter out" list
- we don't enforce colorin via it's commit_params if we develop with finalscale enabled.
@jenshannoschwalm jenshannoschwalm marked this pull request as ready for review October 13, 2024 07:55
@TurboGit TurboGit added this to the 5.0 milestone Oct 14, 2024
@TurboGit
Copy link
Member

Today I had a need to use the composite module, and the color was bad. I then tried the demo I had posted on the PR when working on this, and the color was bad. I remembered about this PR, testing it and all was back to normal.

What I don't understand is that this was working when release 4.8 was done since I tested it... What could have been broken this since then... Really puzzling ! But for sure this PR is correct to me. Will double check later.

@jenshannoschwalm
Copy link
Collaborator Author

I think we had this wrong also in 4.8 ...

@TurboGit
Copy link
Member

I think we had this wrong also in 4.8 ...

Agreed, but it was ok at some point as I had tested and published examples using this module in the PR. See for example:

#15465 (comment)

#15465 (comment)

In original module (first implementation), commit fca903e:

+    if((disable
+        && !dt_iop_module_is(mod->so, "gamma"))
+       || (is_current
+           && (dt_iop_module_is(mod->so, "enlargecanvas")
+               || dt_iop_module_is(mod->so, "overlay")
+               || dt_iop_module_is(mod->so, "crop")
+               || dt_iop_module_is(mod->so, "flip")
+               || dt_iop_module_is(mod->so, "ashift"))))
+    {
+      result = g_list_prepend(result, mod->op);
+    }

But is was add on Jun 16th in commit a775869 by you.

I probably didn't test properly this change or at least didn't pay attention to the color shift. Really too bad that I missed that :(

Copy link
Member

@TurboGit TurboGit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Obviously correct and corresponding to the initial implementation of overlay module.

@TurboGit TurboGit added release notes: pending priority: high core features are broken and not usable at all, software crashes and removed priority: medium core features are degraded in a way that is still mostly usable, software stutters labels Oct 14, 2024
@TurboGit TurboGit merged commit bfec298 into darktable-org:master Oct 14, 2024
6 checks passed
@jenshannoschwalm
Copy link
Collaborator Author

Indeed i introduced that issue, sorry about that and about me not pushing harder on this pr :-(

@jenshannoschwalm jenshannoschwalm deleted the overlay_colorspace branch October 14, 2024 16:18
@TurboGit
Copy link
Member

@jenshannoschwalm : That's also my fault, so not problem. The good news is that I have added two tests for the overlay module (only self referencing overlay for the testsuite).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix pull request fixing a bug priority: high core features are broken and not usable at all, software crashes scope: color management ensuring consistency of colour adaptation through display/output profiles scope: image processing correcting pixels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants