Skip to content

Two pixelpipe bugfixes plus maintenance #21106

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.

Sign up for GitHub

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

Merged
TurboGit merged 4 commits into from
May 23, 2026
+103 −134
Merged

Two pixelpipe bugfixes plus maintenance #21106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba97902
CPU pixelpipe cache integrity after module colorspace conversion
jenshannoschwalm May 23, 2026
7b23b02
Fix preview pixelpipe caching issue
jenshannoschwalm May 23, 2026
c3c08bb
The colorspace transform functions use `dt_iop_colorspace_type_t()`
jenshannoschwalm May 23, 2026
99bf1d5
Some maintenance work for pixelpipe processing
jenshannoschwalm May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions src/common/iop_profile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,16 +1183,15 @@ gchar *dt_ioppr_get_location_tooltip(const char *subdir, const char *for_name)
}

__DT_CLONE_TARGETS__
void dt_ioppr_transform_image_colorspace
(struct dt_iop_module_t *self,
const float *const image_in,
float *const image_out,
const int width,
const int height,
const int cst_from,
const int cst_to,
int *converted_cst,
const dt_iop_order_iccprofile_info_t *const profile_info)
void dt_ioppr_transform_image_colorspace(struct dt_iop_module_t *self,
const float *const image_in,
float *const image_out,
const int width,
const int height,
const dt_iop_colorspace_type_t cst_from,
const dt_iop_colorspace_type_t cst_to,
dt_iop_colorspace_type_t *converted_cst,
const dt_iop_order_iccprofile_info_t *const profile_info)
{
const gboolean inplace = image_in == image_out;

Expand Down Expand Up @@ -1473,17 +1472,16 @@ void dt_ioppr_free_iccprofile_params_cl(dt_colorspaces_iccprofile_info_cl_t **_p
*_dev_profile_lut = NULL;
}

gboolean dt_ioppr_transform_image_colorspace_cl
(struct dt_iop_module_t *self,
const int devid,
cl_mem dev_img_in,
cl_mem dev_img_out,
const int width,
const int height,
const int cst_from,
const int cst_to,
int *converted_cst,
const dt_iop_order_iccprofile_info_t *const profile_info)
gboolean dt_ioppr_transform_image_colorspace_cl(struct dt_iop_module_t *self,
const int devid,
cl_mem dev_img_in,
cl_mem dev_img_out,
const int width,
const int height,
const dt_iop_colorspace_type_t cst_from,
const dt_iop_colorspace_type_t cst_to,
dt_iop_colorspace_type_t *converted_cst,
const dt_iop_order_iccprofile_info_t *const profile_info)
{
cl_int err = CL_SUCCESS;

Expand Down
12 changes: 6 additions & 6 deletions src/common/iop_profile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ void dt_ioppr_transform_image_colorspace
float *const image_out,
const int width,
const int height,
const int cst_from,
const int cst_to,
int *converted_cst,
const dt_iop_colorspace_type_t cst_from,
const dt_iop_colorspace_type_t cst_to,
dt_iop_colorspace_type_t *converted_cst,
const dt_iop_order_iccprofile_info_t *const profile_info);

void dt_ioppr_transform_image_colorspace_rgb
Expand Down Expand Up @@ -222,9 +222,9 @@ gboolean dt_ioppr_transform_image_colorspace_cl
cl_mem dev_img_out,
const int width,
const int height,
const int cst_from,
const int cst_to,
int *converted_cst,
const dt_iop_colorspace_type_t cst_from,
const dt_iop_colorspace_type_t cst_to,
dt_iop_colorspace_type_t *converted_cst,
const dt_iop_order_iccprofile_info_t *const profile_info);

gboolean dt_ioppr_transform_image_colorspace_rgb_cl
Expand Down
Loading
Loading