From 178794f6f1d28ec7a8c7f483f747d80521b49c4e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 9 Jan 2017 02:45:16 +0100 Subject: [PATCH] libgimpbase: rename enum GimpHueRange's values and add compat cruft for the old names. --- app/operations/gimphuesaturationconfig.c | 10 ++-- app/operations/gimpoperationhuesaturation.c | 8 +-- app/pdb/color-cmds.c | 2 +- app/pdb/drawable-color-cmds.c | 2 +- libgimpbase/gimpbase-private.c | 2 + libgimpbase/gimpbaseenums.c | 28 ++++----- libgimpbase/gimpbaseenums.h | 24 +++++--- libgimpbase/gimpcompatenums.c | 40 +++++++++++++ libgimpbase/gimpcompatenums.h | 16 +++++ plug-ins/pygimp/gimpenumsmodule.c | 65 +++++++++++++-------- plug-ins/script-fu/scheme-wrapper.c | 8 +++ tools/pdbgen/enums.pl | 21 +++---- 12 files changed, 159 insertions(+), 67 deletions(-) diff --git a/app/operations/gimphuesaturationconfig.c b/app/operations/gimphuesaturationconfig.c index ac3a13b669..6fd81dbcfd 100644 --- a/app/operations/gimphuesaturationconfig.c +++ b/app/operations/gimphuesaturationconfig.c @@ -94,7 +94,7 @@ gimp_hue_saturation_config_class_init (GimpHueSaturationConfigClass *klass) _("Range"), _("The affected range"), GIMP_TYPE_HUE_RANGE, - GIMP_ALL_HUES, 0); + GIMP_HUE_RANGE_ALL, 0); GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_HUE, "hue", @@ -227,7 +227,7 @@ gimp_hue_saturation_config_serialize (GimpConfig *config, old_range = hs_config->range; - for (range = GIMP_ALL_HUES; range <= GIMP_MAGENTA_HUES; range++) + for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++) { hs_config->range = range; @@ -280,7 +280,7 @@ gimp_hue_saturation_config_equal (GimpConfig *a, GimpHueSaturationConfig *config_b = GIMP_HUE_SATURATION_CONFIG (b); GimpHueRange range; - for (range = GIMP_ALL_HUES; range <= GIMP_MAGENTA_HUES; range++) + for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++) { if (config_a->hue[range] != config_b->hue[range] || config_a->saturation[range] != config_b->saturation[range] || @@ -302,7 +302,7 @@ gimp_hue_saturation_config_reset (GimpConfig *config) GimpHueSaturationConfig *hs_config = GIMP_HUE_SATURATION_CONFIG (config); GimpHueRange range; - for (range = GIMP_ALL_HUES; range <= GIMP_MAGENTA_HUES; range++) + for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++) { hs_config->range = range; gimp_hue_saturation_config_reset_range (hs_config); @@ -321,7 +321,7 @@ gimp_hue_saturation_config_copy (GimpConfig *src, GimpHueSaturationConfig *dest_config = GIMP_HUE_SATURATION_CONFIG (dest); GimpHueRange range; - for (range = GIMP_ALL_HUES; range <= GIMP_MAGENTA_HUES; range++) + for (range = GIMP_HUE_RANGE_ALL; range <= GIMP_HUE_RANGE_MAGENTA; range++) { dest_config->hue[range] = src_config->hue[range]; dest_config->saturation[range] = src_config->saturation[range]; diff --git a/app/operations/gimpoperationhuesaturation.c b/app/operations/gimpoperationhuesaturation.c index 80d47e2070..7dbc69a0d9 100644 --- a/app/operations/gimpoperationhuesaturation.c +++ b/app/operations/gimpoperationhuesaturation.c @@ -85,7 +85,7 @@ map_hue (GimpHueSaturationConfig *config, GimpHueRange range, gdouble value) { - value += (config->hue[GIMP_ALL_HUES] + config->hue[range]) / 2.0; + value += (config->hue[GIMP_HUE_RANGE_ALL] + config->hue[range]) / 2.0; if (value < 0) return value + 1.0; @@ -117,7 +117,7 @@ map_hue_overlap (GimpHueSaturationConfig *config, gdouble v = config->hue[primary_range] * primary_intensity + config->hue[secondary_range] * secondary_intensity; - value += (config->hue[GIMP_ALL_HUES] + v) / 2.0; + value += (config->hue[GIMP_HUE_RANGE_ALL] + v) / 2.0; if (value < 0) return value + 1.0; @@ -132,7 +132,7 @@ map_saturation (GimpHueSaturationConfig *config, GimpHueRange range, gdouble value) { - gdouble v = config->saturation[GIMP_ALL_HUES] + config->saturation[range]; + gdouble v = config->saturation[GIMP_HUE_RANGE_ALL] + config->saturation[range]; /* This change affects the way saturation is computed. With the old * code (different code for value < 0), increasing the saturation @@ -152,7 +152,7 @@ map_lightness (GimpHueSaturationConfig *config, GimpHueRange range, gdouble value) { - gdouble v = (config->lightness[GIMP_ALL_HUES] + config->lightness[range]) / 2.0; + gdouble v = (config->lightness[GIMP_HUE_RANGE_ALL] + config->lightness[range]) / 2.0; if (v < 0) return value * (v + 1.0); diff --git a/app/pdb/color-cmds.c b/app/pdb/color-cmds.c index 2c86e6365d..1506425e55 100644 --- a/app/pdb/color-cmds.c +++ b/app/pdb/color-cmds.c @@ -1349,7 +1349,7 @@ register_color_procs (GimpPDB *pdb) "hue range", "Range of affected hues", GIMP_TYPE_HUE_RANGE, - GIMP_ALL_HUES, + GIMP_HUE_RANGE_ALL, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_double ("hue-offset", diff --git a/app/pdb/drawable-color-cmds.c b/app/pdb/drawable-color-cmds.c index 7b7dc33fb1..f8b564ea1a 100644 --- a/app/pdb/drawable-color-cmds.c +++ b/app/pdb/drawable-color-cmds.c @@ -1104,7 +1104,7 @@ register_drawable_color_procs (GimpPDB *pdb) "hue range", "Range of affected hues", GIMP_TYPE_HUE_RANGE, - GIMP_ALL_HUES, + GIMP_HUE_RANGE_ALL, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_double ("hue-offset", diff --git a/libgimpbase/gimpbase-private.c b/libgimpbase/gimpbase-private.c index c4544f83bc..43550cd09e 100644 --- a/libgimpbase/gimpbase-private.c +++ b/libgimpbase/gimpbase-private.c @@ -59,6 +59,8 @@ gimp_base_init (GimpUnitVtable *vtable) (gpointer) GIMP_TYPE_CONVOLVE_TYPE_COMPAT); g_type_set_qdata (GIMP_TYPE_FILL_TYPE, quark, (gpointer) GIMP_TYPE_FILL_TYPE_COMPAT); + g_type_set_qdata (GIMP_TYPE_HUE_RANGE, quark, + (gpointer) GIMP_TYPE_HUE_RANGE_COMPAT); gimp_base_initialized = TRUE; } diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c index 0f4e3fbf33..d7eb98c6d7 100644 --- a/libgimpbase/gimpbaseenums.c +++ b/libgimpbase/gimpbaseenums.c @@ -783,25 +783,25 @@ gimp_hue_range_get_type (void) { static const GEnumValue values[] = { - { GIMP_ALL_HUES, "GIMP_ALL_HUES", "all-hues" }, - { GIMP_RED_HUES, "GIMP_RED_HUES", "red-hues" }, - { GIMP_YELLOW_HUES, "GIMP_YELLOW_HUES", "yellow-hues" }, - { GIMP_GREEN_HUES, "GIMP_GREEN_HUES", "green-hues" }, - { GIMP_CYAN_HUES, "GIMP_CYAN_HUES", "cyan-hues" }, - { GIMP_BLUE_HUES, "GIMP_BLUE_HUES", "blue-hues" }, - { GIMP_MAGENTA_HUES, "GIMP_MAGENTA_HUES", "magenta-hues" }, + { GIMP_HUE_RANGE_ALL, "GIMP_HUE_RANGE_ALL", "all" }, + { GIMP_HUE_RANGE_RED, "GIMP_HUE_RANGE_RED", "red" }, + { GIMP_HUE_RANGE_YELLOW, "GIMP_HUE_RANGE_YELLOW", "yellow" }, + { GIMP_HUE_RANGE_GREEN, "GIMP_HUE_RANGE_GREEN", "green" }, + { GIMP_HUE_RANGE_CYAN, "GIMP_HUE_RANGE_CYAN", "cyan" }, + { GIMP_HUE_RANGE_BLUE, "GIMP_HUE_RANGE_BLUE", "blue" }, + { GIMP_HUE_RANGE_MAGENTA, "GIMP_HUE_RANGE_MAGENTA", "magenta" }, { 0, NULL, NULL } }; static const GimpEnumDesc descs[] = { - { GIMP_ALL_HUES, "GIMP_ALL_HUES", NULL }, - { GIMP_RED_HUES, "GIMP_RED_HUES", NULL }, - { GIMP_YELLOW_HUES, "GIMP_YELLOW_HUES", NULL }, - { GIMP_GREEN_HUES, "GIMP_GREEN_HUES", NULL }, - { GIMP_CYAN_HUES, "GIMP_CYAN_HUES", NULL }, - { GIMP_BLUE_HUES, "GIMP_BLUE_HUES", NULL }, - { GIMP_MAGENTA_HUES, "GIMP_MAGENTA_HUES", NULL }, + { GIMP_HUE_RANGE_ALL, "GIMP_HUE_RANGE_ALL", NULL }, + { GIMP_HUE_RANGE_RED, "GIMP_HUE_RANGE_RED", NULL }, + { GIMP_HUE_RANGE_YELLOW, "GIMP_HUE_RANGE_YELLOW", NULL }, + { GIMP_HUE_RANGE_GREEN, "GIMP_HUE_RANGE_GREEN", NULL }, + { GIMP_HUE_RANGE_CYAN, "GIMP_HUE_RANGE_CYAN", NULL }, + { GIMP_HUE_RANGE_BLUE, "GIMP_HUE_RANGE_BLUE", NULL }, + { GIMP_HUE_RANGE_MAGENTA, "GIMP_HUE_RANGE_MAGENTA", NULL }, { 0, NULL, NULL } }; diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h index 3ec8e8409f..69757b761a 100644 --- a/libgimpbase/gimpbaseenums.h +++ b/libgimpbase/gimpbaseenums.h @@ -388,13 +388,23 @@ GType gimp_hue_range_get_type (void) G_GNUC_CONST; typedef enum { - GIMP_ALL_HUES, - GIMP_RED_HUES, - GIMP_YELLOW_HUES, - GIMP_GREEN_HUES, - GIMP_CYAN_HUES, - GIMP_BLUE_HUES, - GIMP_MAGENTA_HUES + GIMP_HUE_RANGE_ALL, + GIMP_HUE_RANGE_RED, + GIMP_HUE_RANGE_YELLOW, + GIMP_HUE_RANGE_GREEN, + GIMP_HUE_RANGE_CYAN, + GIMP_HUE_RANGE_BLUE, + GIMP_HUE_RANGE_MAGENTA, + +#ifndef GIMP_DISABLE_DEPRECATED + GIMP_ALL_HUES = GIMP_HUE_RANGE_ALL, /*< skip, pdb-skip >*/ + GIMP_RED_HUES = GIMP_HUE_RANGE_RED, /*< skip, pdb-skip >*/ + GIMP_YELLOW_HUES = GIMP_HUE_RANGE_YELLOW, /*< skip, pdb-skip >*/ + GIMP_GREEN_HUES = GIMP_HUE_RANGE_GREEN, /*< skip, pdb-skip >*/ + GIMP_CYAN_HUES = GIMP_HUE_RANGE_CYAN, /*< skip, pdb-skip >*/ + GIMP_BLUE_HUES = GIMP_HUE_RANGE_BLUE, /*< skip, pdb-skip >*/ + GIMP_MAGENTA_HUES = GIMP_HUE_RANGE_MAGENTA /*< skip, pdb-skip >*/ +#endif /* GIMP_DISABLE_DEPRECATED */ } GimpHueRange; diff --git a/libgimpbase/gimpcompatenums.c b/libgimpbase/gimpcompatenums.c index 7782863bdb..41bb79a2fb 100644 --- a/libgimpbase/gimpcompatenums.c +++ b/libgimpbase/gimpcompatenums.c @@ -210,6 +210,46 @@ gimp_fill_type_compat_get_type (void) return type; } +GType +gimp_hue_range_compat_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_ALL_HUES, "GIMP_ALL_HUES", "all-hues" }, + { GIMP_RED_HUES, "GIMP_RED_HUES", "red-hues" }, + { GIMP_YELLOW_HUES, "GIMP_YELLOW_HUES", "yellow-hues" }, + { GIMP_GREEN_HUES, "GIMP_GREEN_HUES", "green-hues" }, + { GIMP_CYAN_HUES, "GIMP_CYAN_HUES", "cyan-hues" }, + { GIMP_BLUE_HUES, "GIMP_BLUE_HUES", "blue-hues" }, + { GIMP_MAGENTA_HUES, "GIMP_MAGENTA_HUES", "magenta-hues" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_ALL_HUES, "GIMP_ALL_HUES", NULL }, + { GIMP_RED_HUES, "GIMP_RED_HUES", NULL }, + { GIMP_YELLOW_HUES, "GIMP_YELLOW_HUES", NULL }, + { GIMP_GREEN_HUES, "GIMP_GREEN_HUES", NULL }, + { GIMP_CYAN_HUES, "GIMP_CYAN_HUES", NULL }, + { GIMP_BLUE_HUES, "GIMP_BLUE_HUES", NULL }, + { GIMP_MAGENTA_HUES, "GIMP_MAGENTA_HUES", NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (G_UNLIKELY (! type)) + { + type = g_enum_register_static ("GimpHueRangeCompat", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_type_set_translation_context (type, "hue-range-compat"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + /* Generated data ends here */ diff --git a/libgimpbase/gimpcompatenums.h b/libgimpbase/gimpcompatenums.h index 1abd1fd716..c7486970f7 100644 --- a/libgimpbase/gimpcompatenums.h +++ b/libgimpbase/gimpcompatenums.h @@ -104,6 +104,22 @@ typedef enum } GimpFillTypeCompat; +#define GIMP_TYPE_HUE_RANGE_COMPAT (gimp_hue_range_compat_get_type ()) + +GType gimp_hue_range_compat_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_ALL_HUES, + GIMP_RED_HUES, + GIMP_YELLOW_HUES, + GIMP_GREEN_HUES, + GIMP_CYAN_HUES, + GIMP_BLUE_HUES, + GIMP_MAGENTA_HUES +} GimpHueRangeCompat; + + G_END_DECLS #endif /* __GIMP_COMPAT_ENUMS_H__ */ diff --git a/plug-ins/pygimp/gimpenumsmodule.c b/plug-ins/pygimp/gimpenumsmodule.c index bcfadf5750..177e49dc57 100644 --- a/plug-ins/pygimp/gimpenumsmodule.c +++ b/plug-ins/pygimp/gimpenumsmodule.c @@ -156,31 +156,20 @@ add_compat_enums(PyObject *m) PyModule_AddIntConstant(m, "DESATURATE_LUMINOSITY", GIMP_DESATURATE_LUMA); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_RGB", - GIMP_EXPORT_CAN_HANDLE_RGB); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_GRAY", - GIMP_EXPORT_CAN_HANDLE_GRAY); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_INDEXED", - GIMP_EXPORT_CAN_HANDLE_INDEXED); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_BITMAP", - GIMP_EXPORT_CAN_HANDLE_BITMAP); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_ALPHA", - GIMP_EXPORT_CAN_HANDLE_ALPHA); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_LAYERS", - GIMP_EXPORT_CAN_HANDLE_LAYERS); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION", - GIMP_EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION); - PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_LAYER_MASKS", - GIMP_EXPORT_CAN_HANDLE_LAYER_MASKS); - PyModule_AddIntConstant(m, "EXPORT_NEEDS_ALPHA", - GIMP_EXPORT_NEEDS_ALPHA); - - PyModule_AddIntConstant(m, "EXPORT_CANCEL", - GIMP_EXPORT_CANCEL); - PyModule_AddIntConstant(m, "EXPORT_IGNORE", - GIMP_EXPORT_IGNORE); - PyModule_AddIntConstant(m, "EXPORT_EXPORT", - GIMP_EXPORT_EXPORT); + PyModule_AddIntConstant (m, "ALL_HUES", + GIMP_HUE_RANGE_ALL); + PyModule_AddIntConstant (m, "RED_HUES", + GIMP_HUE_RANGE_RED); + PyModule_AddIntConstant (m, "YELLOW_HUES", + GIMP_HUE_RANGE_YELLOW); + PyModule_AddIntConstant (m, "GREEN_HUES", + GIMP_HUE_RANGE_GREEN); + PyModule_AddIntConstant (m, "CYAN_HUES", + GIMP_HUE_RANGE_CYAN); + PyModule_AddIntConstant (m, "BLUE_HUES", + GIMP_HUE_RANGE_BLUE); + PyModule_AddIntConstant (m, "MAGENTA_HUES", + GIMP_HUE_RANGE_MAGENTA); PyModule_AddIntConstant (m, "NORMAL_MODE", GIMP_LAYER_MODE_NORMAL); @@ -228,6 +217,32 @@ add_compat_enums(PyObject *m) GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY); PyModule_AddIntConstant (m, "COLOR_ERASE_MODE", GIMP_LAYER_MODE_COLOR_ERASE); + + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_RGB", + GIMP_EXPORT_CAN_HANDLE_RGB); + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_GRAY", + GIMP_EXPORT_CAN_HANDLE_GRAY); + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_INDEXED", + GIMP_EXPORT_CAN_HANDLE_INDEXED); + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_BITMAP", + GIMP_EXPORT_CAN_HANDLE_BITMAP); + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_ALPHA", + GIMP_EXPORT_CAN_HANDLE_ALPHA); + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_LAYERS", + GIMP_EXPORT_CAN_HANDLE_LAYERS); + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION", + GIMP_EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION); + PyModule_AddIntConstant(m, "EXPORT_CAN_HANDLE_LAYER_MASKS", + GIMP_EXPORT_CAN_HANDLE_LAYER_MASKS); + PyModule_AddIntConstant(m, "EXPORT_NEEDS_ALPHA", + GIMP_EXPORT_NEEDS_ALPHA); + + PyModule_AddIntConstant(m, "EXPORT_CANCEL", + GIMP_EXPORT_CANCEL); + PyModule_AddIntConstant(m, "EXPORT_IGNORE", + GIMP_EXPORT_IGNORE); + PyModule_AddIntConstant(m, "EXPORT_EXPORT", + GIMP_EXPORT_EXPORT); } static void diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c index cc619bf94a..746efe9126 100644 --- a/plug-ins/script-fu/scheme-wrapper.c +++ b/plug-ins/script-fu/scheme-wrapper.c @@ -171,6 +171,14 @@ static const NamedConstant const old_constants[] = { "DESATURATE-LUMINOSITY", GIMP_DESATURATE_LUMA }, + { "ALL-HUES", GIMP_HUE_RANGE_ALL }, + { "RED-HUES", GIMP_HUE_RANGE_RED }, + { "YELLOW-HUES", GIMP_HUE_RANGE_YELLOW }, + { "GREEN-HUES", GIMP_HUE_RANGE_GREEN }, + { "CYAN-HUES", GIMP_HUE_RANGE_CYAN }, + { "BLUE-HUES", GIMP_HUE_RANGE_BLUE }, + { "MAGENTA-HUES", GIMP_HUE_RANGE_MAGENTA }, + { "NORMAL-MODE", GIMP_LAYER_MODE_NORMAL }, { "DISSOLVE-MODE", GIMP_LAYER_MODE_DISSOLVE }, { "BEHIND-MODE", GIMP_LAYER_MODE_BEHIND }, diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index 801b4996b7..fefc0aa5fc 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -253,16 +253,17 @@ package Gimp::CodeGen::enums; GimpHueRange => { contig => 1, header => 'libgimpbase/gimpbaseenums.h', - symbols => [ qw(GIMP_ALL_HUES GIMP_RED_HUES GIMP_YELLOW_HUES - GIMP_GREEN_HUES GIMP_CYAN_HUES GIMP_BLUE_HUES - GIMP_MAGENTA_HUES) ], - mapping => { GIMP_ALL_HUES => '0', - GIMP_RED_HUES => '1', - GIMP_YELLOW_HUES => '2', - GIMP_GREEN_HUES => '3', - GIMP_CYAN_HUES => '4', - GIMP_BLUE_HUES => '5', - GIMP_MAGENTA_HUES => '6' } + symbols => [ qw(GIMP_HUE_RANGE_ALL GIMP_HUE_RANGE_RED + GIMP_HUE_RANGE_YELLOW GIMP_HUE_RANGE_GREEN + GIMP_HUE_RANGE_CYAN GIMP_HUE_RANGE_BLUE + GIMP_HUE_RANGE_MAGENTA) ], + mapping => { GIMP_HUE_RANGE_ALL => '0', + GIMP_HUE_RANGE_RED => '1', + GIMP_HUE_RANGE_YELLOW => '2', + GIMP_HUE_RANGE_GREEN => '3', + GIMP_HUE_RANGE_CYAN => '4', + GIMP_HUE_RANGE_BLUE => '5', + GIMP_HUE_RANGE_MAGENTA => '6' } }, GimpIconType => { contig => 1,