From 2c83fb821b172117c5d0d84095bc211157bb6bc1 Mon Sep 17 00:00:00 2001 From: Maxim Solovyov Date: Sat, 22 Jul 2023 01:04:18 +0300 Subject: [PATCH 1/2] config: drop kawase blur method it was added with intention to remove it later almost three years ago in 33c5a5a36b1ccf1da72a9e95079dcc4e3713dce9 --- src/config.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/config.c b/src/config.c index c695433977..7c041ae1a3 100644 --- a/src/config.c +++ b/src/config.c @@ -191,11 +191,6 @@ enum blur_method parse_blur_method(const char *src) { return BLUR_METHOD_GAUSSIAN; } else if (strcmp(src, "dual_kawase") == 0) { return BLUR_METHOD_DUAL_KAWASE; - } else if (strcmp(src, "kawase") == 0) { - log_warn("Blur method 'kawase' has been renamed to 'dual_kawase'. " - "Interpreted as 'dual_kawase', but this will stop working " - "soon."); - return BLUR_METHOD_DUAL_KAWASE; } else if (strcmp(src, "none") == 0) { return BLUR_METHOD_NONE; } From 4a8b937c90f6fac3315846ab32707b32f0d4115d Mon Sep 17 00:00:00 2001 From: Maxim Solovyov Date: Sat, 22 Jul 2023 01:19:22 +0300 Subject: [PATCH 2/2] config: refactor the parse_blur_method function sort blur methods alphabetically and address some clang-tidy issues --- src/config.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/config.c b/src/config.c index 7c041ae1a3..ec39aa4390 100644 --- a/src/config.c +++ b/src/config.c @@ -183,15 +183,19 @@ const char *parse_readnum(const char *src, double *dest) { } enum blur_method parse_blur_method(const char *src) { - if (strcmp(src, "kernel") == 0) { - return BLUR_METHOD_KERNEL; - } else if (strcmp(src, "box") == 0) { + if (strcmp(src, "box") == 0) { return BLUR_METHOD_BOX; - } else if (strcmp(src, "gaussian") == 0) { - return BLUR_METHOD_GAUSSIAN; - } else if (strcmp(src, "dual_kawase") == 0) { + } + if (strcmp(src, "dual_kawase") == 0) { return BLUR_METHOD_DUAL_KAWASE; - } else if (strcmp(src, "none") == 0) { + } + if (strcmp(src, "gaussian") == 0) { + return BLUR_METHOD_GAUSSIAN; + } + if (strcmp(src, "kernel") == 0) { + return BLUR_METHOD_KERNEL; + } + if (strcmp(src, "none") == 0) { return BLUR_METHOD_NONE; } return BLUR_METHOD_INVALID;