Skip to content

Commit

Permalink
Minor code clean-up & reformatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
TurboGit committed Feb 19, 2024
1 parent 36ee7e1 commit 018de4a
Show file tree
Hide file tree
Showing 9 changed files with 380 additions and 191 deletions.
6 changes: 3 additions & 3 deletions src/gui/presets.c
Original file line number Diff line number Diff line change
Expand Up @@ -1989,9 +1989,9 @@ void dt_gui_presets_update_fl(const char *name,
}

void dt_gui_presets_update_format(const char *name,
const dt_dev_operation_t op,
const int32_t version,
const int flag)
const dt_dev_operation_t op,
const int32_t version,
const int flag)
{
sqlite3_stmt *stmt;
// clang-format off
Expand Down
6 changes: 3 additions & 3 deletions src/gui/presets.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ void dt_gui_presets_update_fl(const char *name,
const float max);
/** update dt_gui_presets_format_flag_t */
void dt_gui_presets_update_format(const char *name,
const dt_dev_operation_t op,
const int32_t version,
const int flag);
const dt_dev_operation_t op,
const int32_t version,
const int flag);
/** set auto apply property of preset. */
void dt_gui_presets_update_autoapply(const char *name,
const dt_dev_operation_t op,
Expand Down
2 changes: 1 addition & 1 deletion src/iop/basecurve.c
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ void init_presets(dt_iop_module_so_t *self)
1, DEVELOP_BLEND_CS_RGB_DISPLAY);

dt_gui_presets_update_format(_("display-referred default"), self->op,
self->version(), FOR_RAW);
self->version(), FOR_RAW);

dt_gui_presets_update_autoapply(_("display-referred default"),
self->op, self->version(), TRUE);
Expand Down
2 changes: 1 addition & 1 deletion src/iop/channelmixerrgb.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ void init_presets(dt_iop_module_so_t *self)
1, DEVELOP_BLEND_CS_RGB_SCENE);

dt_gui_presets_update_format(_("scene-referred default"), self->op,
self->version(), FOR_MATRIX);
self->version(), FOR_MATRIX);

dt_gui_presets_update_autoapply(_("scene-referred default"),
self->op, self->version(), TRUE);
Expand Down
2 changes: 1 addition & 1 deletion src/iop/exposure.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ void init_presets(dt_iop_module_so_t *self)
1, DEVELOP_BLEND_CS_RGB_SCENE);

dt_gui_presets_update_format(_("scene-referred default"), self->op,
self->version(), FOR_RAW);
self->version(), FOR_RAW);

dt_gui_presets_update_autoapply(_("scene-referred default"),
self->op, self->version(), TRUE);
Expand Down
2 changes: 1 addition & 1 deletion src/iop/filmicrgb.c
Original file line number Diff line number Diff line change
Expand Up @@ -3313,7 +3313,7 @@ void init_presets(dt_iop_module_so_t *self)
1, DEVELOP_BLEND_CS_RGB_SCENE);

dt_gui_presets_update_format(_("scene-referred default"), self->op,
self->version(), FOR_RAW | FOR_MATRIX);
self->version(), FOR_RAW | FOR_MATRIX);

dt_gui_presets_update_autoapply(_("scene-referred default"),
self->op, self->version(), TRUE);
Expand Down
3 changes: 1 addition & 2 deletions src/iop/sharpen.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void init_presets(dt_iop_module_so_t *self)
1, DEVELOP_BLEND_CS_RGB_DISPLAY);
// restrict to raw images
dt_gui_presets_update_format(_("sharpen"), self->op,
self->version(), FOR_RAW);
self->version(), FOR_RAW);
}

static float *const init_gaussian_kernel(const int rad, const size_t mat_size, const float sigma2)
Expand Down Expand Up @@ -453,4 +453,3 @@ void gui_init(struct dt_iop_module_t *self)
// vim: shiftwidth=2 expandtab tabstop=2 cindent
// kate: tab-indents: off; indent-width 2; replace-tabs on; indent-mode cstyle; remove-trailing-spaces modified;
// clang-format on

24 changes: 16 additions & 8 deletions src/iop/sigmoid.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,15 @@ void init_presets(dt_iop_module_so_t *self)

if(auto_apply_sigmoid)
{
dt_gui_presets_add_generic(_("scene-referred default"), self->op, self->version(), NULL, 0, 1,
dt_gui_presets_add_generic(_("scene-referred default"),
self->op, self->version(), NULL, 0, 1,
DEVELOP_BLEND_CS_RGB_SCENE);

dt_gui_presets_update_format(_("scene-referred default"), self->op, self->version(), FOR_RAW | FOR_MATRIX);
dt_gui_presets_update_format(_("scene-referred default"),
self->op, self->version(), FOR_RAW | FOR_MATRIX);

dt_gui_presets_update_autoapply(_("scene-referred default"), self->op, self->version(), TRUE);
dt_gui_presets_update_autoapply(_("scene-referred default"),
self->op, self->version(), TRUE);
}

// others
Expand All @@ -255,19 +258,22 @@ void init_presets(dt_iop_module_so_t *self)
p.middle_grey_contrast = 1.22f;
p.contrast_skewness = 0.65f;
p.hue_preservation = 100.0f;
dt_gui_presets_add_generic(_("neutral gray"), self->op, self->version(), &p, sizeof(p), 1,
dt_gui_presets_add_generic(_("neutral gray"), self->op,
self->version(), &p, sizeof(p), 1,
DEVELOP_BLEND_CS_RGB_SCENE);

p.middle_grey_contrast = 1.6f;
p.contrast_skewness = -0.2f;
p.hue_preservation = 0.0f;
dt_gui_presets_add_generic(_("ACES 100-nit like"), self->op, self->version(), &p, sizeof(p), 1,
dt_gui_presets_add_generic(_("ACES 100-nit like"), self->op,
self->version(), &p, sizeof(p), 1,
DEVELOP_BLEND_CS_RGB_SCENE);

p.middle_grey_contrast = 1.0f;
p.contrast_skewness = 0.0f;
p.color_processing = DT_SIGMOID_METHOD_RGB_RATIO;
dt_gui_presets_add_generic(_("Reinhard"), self->op, self->version(), &p, sizeof(p), 1,
dt_gui_presets_add_generic(_("Reinhard"), self->op,
self->version(), &p, sizeof(p), 1,
DEVELOP_BLEND_CS_RGB_SCENE);

const float DEG_TO_RAD = DT_M_PI_F / 180.f;
Expand All @@ -287,9 +293,11 @@ void init_presets(dt_iop_module_so_t *self)
p.blue_rotation = -3.f * DEG_TO_RAD;
// Don't restore purity - try to avoid posterization.
p.purity = 0.f;
// Constant base primaries (not dependent on work profile) to maintain a consistent behavior
// Constant base primaries (not dependent on work profile) to
// maintain a consistent behavior
p.base_primaries = DT_SIGMOID_REC2020;
dt_gui_presets_add_generic(_("smooth"), self->op, self->version(), &p, sizeof(p), 1, DEVELOP_BLEND_CS_RGB_SCENE);
dt_gui_presets_add_generic(_("smooth"), self->op, self->version(),
&p, sizeof(p), 1, DEVELOP_BLEND_CS_RGB_SCENE);
}

// Declared here as it is used in the commit params function
Expand Down
Loading

0 comments on commit 018de4a

Please sign in to comment.