Skip to content

Commit

Permalink
Fix overlay conversions
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jenshannoschwalm committed Oct 13, 2024
1 parent 8b13b01 commit 33dd8a0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/iop/colorin.c
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,8 @@ void commit_params(struct dt_iop_module_t *self,
piece->enabled = FALSE;
return;
}
piece->enabled = TRUE;
if(!(piece->pipe->type & DT_DEV_PIXELPIPE_IMAGE_FINAL))
piece->enabled = TRUE;

if(type == DT_COLORSPACE_ENHANCED_MATRIX)
{
Expand Down
2 changes: 0 additions & 2 deletions src/iop/overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ static GList *_get_disabled_modules(const dt_iop_module_t *self,
There are some exceptions:
- gamma and finalscale are required
- crop and &ashift make sense
- colorin is good to keep too
The list order does not matter
*/

Expand All @@ -207,7 +206,6 @@ static GList *_get_disabled_modules(const dt_iop_module_t *self,
&& !dt_iop_module_is(mod->so, "gamma")
&& !dt_iop_module_is(mod->so, "finalscale")
&& !dt_iop_module_is(mod->so, "crop")
&& !dt_iop_module_is(mod->so, "colorin")
&& !dt_iop_module_is(mod->so, "ashift"))
|| (is_current
&& ( dt_iop_module_is(mod->so, "overlay")
Expand Down

0 comments on commit 33dd8a0

Please sign in to comment.