From 63a4e8de56b54db3348f40006020c23589caca0d Mon Sep 17 00:00:00 2001 From: Alx Sa Date: Thu, 12 Sep 2024 03:03:24 +0000 Subject: [PATCH] libgimpbase, libgimpconfig: Remove unused GimpRGBs d_color is no longer used in the codebase. gimp_config_deserialize_rgb () has been superseded by gimp_config_deserialize_color (). --- libgimpbase/gimpprotocol.h | 1 - libgimpconfig/gimpconfig-deserialize.c | 24 ------------------------ 2 files changed, 25 deletions(-) diff --git a/libgimpbase/gimpprotocol.h b/libgimpbase/gimpprotocol.h index 782105e0e1..1e8078fd89 100644 --- a/libgimpbase/gimpprotocol.h +++ b/libgimpbase/gimpprotocol.h @@ -317,7 +317,6 @@ struct _GPParam GBytes *d_bytes; GPParamColor d_gegl_color; GPParamColorArray d_color_array; - GimpRGB d_color; GimpParasite d_parasite; GPParamArray d_array; GPParamIDArray d_id_array; diff --git a/libgimpconfig/gimpconfig-deserialize.c b/libgimpconfig/gimpconfig-deserialize.c index cea24ec426..9c87210843 100644 --- a/libgimpconfig/gimpconfig-deserialize.c +++ b/libgimpconfig/gimpconfig-deserialize.c @@ -74,9 +74,6 @@ static GTokenType gimp_config_deserialize_memsize (GValue *value, static GTokenType gimp_config_deserialize_path (GValue *value, GParamSpec *prop_spec, GScanner *scanner); -static GTokenType gimp_config_deserialize_rgb (GValue *value, - GParamSpec *prop_spec, - GScanner *scanner); static GTokenType gimp_config_deserialize_matrix2 (GValue *value, GParamSpec *prop_spec, GScanner *scanner); @@ -371,10 +368,6 @@ gimp_config_deserialize_value (GValue *value, { return gimp_config_deserialize_path (value, prop_spec, scanner); } - else if (prop_spec->value_type == GIMP_TYPE_RGB) - { - return gimp_config_deserialize_rgb (value, prop_spec, scanner); - } else if (prop_spec->value_type == GIMP_TYPE_MATRIX2) { return gimp_config_deserialize_matrix2 (value, prop_spec, scanner); @@ -715,23 +708,6 @@ gimp_config_deserialize_path (GValue *value, return G_TOKEN_RIGHT_PAREN; } -static GTokenType -gimp_config_deserialize_rgb (GValue *value, - GParamSpec *prop_spec, - GScanner *scanner) -{ - GeglColor *color = NULL; - GimpRGB rgb; - - if (! gimp_scanner_parse_color (scanner, &color)) - return G_TOKEN_NONE; - - gegl_color_get_pixel (color, babl_format ("R'G'B'A double"), &rgb); - g_value_set_boxed (value, &rgb); - - return G_TOKEN_RIGHT_PAREN; -} - static GTokenType gimp_config_deserialize_matrix2 (GValue *value, GParamSpec *prop_spec,