callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpbase: proper names for the GimpChannelType enum

Browse Source 
Register the old value names as compat. Also add some forgotten
values and enums to gimpcompatenums.h
This commit is contained in:
Michael Natterer
2017-01-09 19:40:30 +01:00
parent 0a0acc9f2a
commit 07600c6db6
16 changed files with 373 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libgimpbase/gimpbase-private.c
View File

@ -53,14 +53,26 @@ gimp_base_init (GimpUnitVtable *vtable)
(gpointer) GIMP_TYPE_BLEND_MODE_COMPAT);
g_type_set_qdata (GIMP_TYPE_BUCKET_FILL_MODE, quark,
(gpointer) GIMP_TYPE_BUCKET_FILL_MODE_COMPAT);
g_type_set_qdata (GIMP_TYPE_CHANNEL_TYPE, quark,
(gpointer) GIMP_TYPE_CHANNEL_TYPE_COMPAT);
g_type_set_qdata (GIMP_TYPE_CLONE_TYPE, quark,
(gpointer) GIMP_TYPE_CLONE_TYPE_COMPAT);
g_type_set_qdata (GIMP_TYPE_CONVOLVE_TYPE, quark,
(gpointer) GIMP_TYPE_CONVOLVE_TYPE_COMPAT);
g_type_set_qdata (GIMP_TYPE_DESATURATE_MODE, quark,
(gpointer) GIMP_TYPE_DESATURATE_MODE_COMPAT);
g_type_set_qdata (GIMP_TYPE_DODGE_BURN_TYPE, quark,
(gpointer) GIMP_TYPE_DODGE_BURN_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);
g_type_set_qdata (GIMP_TYPE_ICON_TYPE, quark,
(gpointer) GIMP_TYPE_ICON_TYPE_COMPAT);
g_type_set_qdata (GIMP_TYPE_INTERPOLATION_TYPE, quark,
(gpointer) GIMP_TYPE_INTERPOLATION_TYPE_COMPAT);
g_type_set_qdata (GIMP_TYPE_TRANSFER_MODE, quark,
(gpointer) GIMP_TYPE_TRANSFER_MODE_COMPAT);
gimp_base_initialized = TRUE;
}

24
libgimpbase/gimpbaseenums.c
View File

@ -217,23 +217,23 @@ gimp_channel_type_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_RED_CHANNEL, "GIMP_RED_CHANNEL", "red-channel" },
{ GIMP_GREEN_CHANNEL, "GIMP_GREEN_CHANNEL", "green-channel" },
{ GIMP_BLUE_CHANNEL, "GIMP_BLUE_CHANNEL", "blue-channel" },
{ GIMP_GRAY_CHANNEL, "GIMP_GRAY_CHANNEL", "gray-channel" },
{ GIMP_INDEXED_CHANNEL, "GIMP_INDEXED_CHANNEL", "indexed-channel" },
{ GIMP_ALPHA_CHANNEL, "GIMP_ALPHA_CHANNEL", "alpha-channel" },
{ GIMP_CHANNEL_RED, "GIMP_CHANNEL_RED", "red" },
{ GIMP_CHANNEL_GREEN, "GIMP_CHANNEL_GREEN", "green" },
{ GIMP_CHANNEL_BLUE, "GIMP_CHANNEL_BLUE", "blue" },
{ GIMP_CHANNEL_GRAY, "GIMP_CHANNEL_GRAY", "gray" },
{ GIMP_CHANNEL_INDEXED, "GIMP_CHANNEL_INDEXED", "indexed" },
{ GIMP_CHANNEL_ALPHA, "GIMP_CHANNEL_ALPHA", "alpha" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_RED_CHANNEL, NC_("channel-type", "Red"), NULL },
{ GIMP_GREEN_CHANNEL, NC_("channel-type", "Green"), NULL },
{ GIMP_BLUE_CHANNEL, NC_("channel-type", "Blue"), NULL },
{ GIMP_GRAY_CHANNEL, NC_("channel-type", "Gray"), NULL },
{ GIMP_INDEXED_CHANNEL, NC_("channel-type", "Indexed"), NULL },
{ GIMP_ALPHA_CHANNEL, NC_("channel-type", "Alpha"), NULL },
{ GIMP_CHANNEL_RED, NC_("channel-type", "Red"), NULL },
{ GIMP_CHANNEL_GREEN, NC_("channel-type", "Green"), NULL },
{ GIMP_CHANNEL_BLUE, NC_("channel-type", "Blue"), NULL },
{ GIMP_CHANNEL_GRAY, NC_("channel-type", "Gray"), NULL },
{ GIMP_CHANNEL_INDEXED, NC_("channel-type", "Indexed"), NULL },
{ GIMP_CHANNEL_ALPHA, NC_("channel-type", "Alpha"), NULL },
{ 0, NULL, NULL }
};

21
libgimpbase/gimpbaseenums.h
View File

@ -141,12 +141,21 @@ GType gimp_channel_type_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_RED_CHANNEL, /*< desc="Red" >*/
GIMP_GREEN_CHANNEL, /*< desc="Green" >*/
GIMP_BLUE_CHANNEL, /*< desc="Blue" >*/
GIMP_GRAY_CHANNEL, /*< desc="Gray" >*/
GIMP_INDEXED_CHANNEL, /*< desc="Indexed" >*/
GIMP_ALPHA_CHANNEL /*< desc="Alpha" >*/
GIMP_CHANNEL_RED, /*< desc="Red" >*/
GIMP_CHANNEL_GREEN, /*< desc="Green" >*/
GIMP_CHANNEL_BLUE, /*< desc="Blue" >*/
GIMP_CHANNEL_GRAY, /*< desc="Gray" >*/
GIMP_CHANNEL_INDEXED, /*< desc="Indexed" >*/
GIMP_CHANNEL_ALPHA, /*< desc="Alpha" >*/
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_RED_CHANNEL = GIMP_CHANNEL_RED, /*< skip, pdb-skip >*/
GIMP_GREEN_CHANNEL = GIMP_CHANNEL_GREEN, /*< skip, pdb-skip >*/
GIMP_BLUE_CHANNEL = GIMP_CHANNEL_BLUE, /*< skip, pdb-skip >*/
GIMP_GRAY_CHANNEL = GIMP_CHANNEL_GRAY, /*< skip, pdb-skip >*/
GIMP_INDEXED_CHANNEL = GIMP_CHANNEL_INDEXED, /*< skip, pdb-skip >*/
GIMP_ALPHA_CHANNEL = GIMP_CHANNEL_ALPHA /*< skip, pdb-skip >*/
#endif /* GIMP_DISABLE_DEPRECATED */
} GimpChannelType;

184
libgimpbase/gimpcompatenums.c
View File

@ -114,6 +114,44 @@ gimp_bucket_fill_mode_compat_get_type (void)
return type;
}
GType
gimp_channel_type_compat_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_RED_CHANNEL, "GIMP_RED_CHANNEL", "red-channel" },
{ GIMP_GREEN_CHANNEL, "GIMP_GREEN_CHANNEL", "green-channel" },
{ GIMP_BLUE_CHANNEL, "GIMP_BLUE_CHANNEL", "blue-channel" },
{ GIMP_GRAY_CHANNEL, "GIMP_GRAY_CHANNEL", "gray-channel" },
{ GIMP_INDEXED_CHANNEL, "GIMP_INDEXED_CHANNEL", "indexed-channel" },
{ GIMP_ALPHA_CHANNEL, "GIMP_ALPHA_CHANNEL", "alpha-channel" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_RED_CHANNEL, "GIMP_RED_CHANNEL", NULL },
{ GIMP_GREEN_CHANNEL, "GIMP_GREEN_CHANNEL", NULL },
{ GIMP_BLUE_CHANNEL, "GIMP_BLUE_CHANNEL", NULL },
{ GIMP_GRAY_CHANNEL, "GIMP_GRAY_CHANNEL", NULL },
{ GIMP_INDEXED_CHANNEL, "GIMP_INDEXED_CHANNEL", NULL },
{ GIMP_ALPHA_CHANNEL, "GIMP_ALPHA_CHANNEL", NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpChannelTypeCompat", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_type_set_translation_context (type, "channel-type-compat");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_clone_type_compat_get_type (void)
{
@ -174,6 +212,64 @@ gimp_convolve_type_compat_get_type (void)
return type;
}
GType
gimp_desaturate_mode_compat_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_DESATURATE_LUMINOSITY, "GIMP_DESATURATE_LUMINOSITY", "luminosity" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_DESATURATE_LUMINOSITY, "GIMP_DESATURATE_LUMINOSITY", NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpDesaturateModeCompat", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_type_set_translation_context (type, "desaturate-mode-compat");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_dodge_burn_type_compat_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_DODGE, "GIMP_DODGE", "dodge" },
{ GIMP_BURN, "GIMP_BURN", "burn" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_DODGE, "GIMP_DODGE", NULL },
{ GIMP_BURN, "GIMP_BURN", NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpDodgeBurnTypeCompat", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_type_set_translation_context (type, "dodge-burn-type-compat");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_fill_type_compat_get_type (void)
{
@ -250,6 +346,94 @@ gimp_hue_range_compat_get_type (void)
return type;
}
GType
gimp_icon_type_compat_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_ICON_TYPE_STOCK_ID, "GIMP_ICON_TYPE_STOCK_ID", "id" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_ICON_TYPE_STOCK_ID, "GIMP_ICON_TYPE_STOCK_ID", NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpIconTypeCompat", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_type_set_translation_context (type, "icon-type-compat");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_interpolation_type_compat_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_INTERPOLATION_LANCZOS, "GIMP_INTERPOLATION_LANCZOS", "lanczos" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_INTERPOLATION_LANCZOS, "GIMP_INTERPOLATION_LANCZOS", NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpInterpolationTypeCompat", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_type_set_translation_context (type, "interpolation-type-compat");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_transfer_mode_compat_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_SHADOWS, "GIMP_SHADOWS", "shadows" },
{ GIMP_MIDTONES, "GIMP_MIDTONES", "midtones" },
{ GIMP_HIGHLIGHTS, "GIMP_HIGHLIGHTS", "highlights" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_SHADOWS, "GIMP_SHADOWS", NULL },
{ GIMP_MIDTONES, "GIMP_MIDTONES", NULL },
{ GIMP_HIGHLIGHTS, "GIMP_HIGHLIGHTS", NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpTransferModeCompat", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_type_set_translation_context (type, "transfer-mode-compat");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
/* Generated data ends here */

82
libgimpbase/gimpcompatenums.h
View File

@ -68,6 +68,21 @@ typedef enum
} GimpBucketFillModeCompat;
#define GIMP_TYPE_CHANNEL_TYPE_COMPAT (gimp_channel_type_compat_get_type ())
GType gimp_channel_type_compat_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_RED_CHANNEL = GIMP_CHANNEL_RED,
GIMP_GREEN_CHANNEL = GIMP_CHANNEL_GREEN,
GIMP_BLUE_CHANNEL = GIMP_CHANNEL_BLUE,
GIMP_GRAY_CHANNEL = GIMP_CHANNEL_GRAY,
GIMP_INDEXED_CHANNEL = GIMP_CHANNEL_INDEXED,
GIMP_ALPHA_CHANNEL = GIMP_CHANNEL_ALPHA
} GimpChannelTypeCompat;
#define GIMP_TYPE_CLONE_TYPE_COMPAT (gimp_clone_type_compat_get_type ())
GType gimp_clone_type_compat_get_type (void) G_GNUC_CONST;
@ -90,6 +105,27 @@ typedef enum
} GimpConvolveTypeCompat;
#define GIMP_TYPE_DESATURATE_MODE_COMPAT (gimp_desaturate_mode_compat_get_type ())
GType gimp_desaturate_mode_compat_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_DESATURATE_LUMINOSITY = GIMP_DESATURATE_LUMA
} GimpDesaturateModeCompat;
#define GIMP_TYPE_DODGE_BURN_TYPE_COMPAT (gimp_dodge_burn_type_compat_get_type ())
GType gimp_dodge_burn_type_compat_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_DODGE = GIMP_DODGE_BURN_TYPE_DODGE,
GIMP_BURN = GIMP_DODGE_BURN_TYPE_BURN
} GimpDodgeBurnTypeCompat;
#define GIMP_TYPE_FILL_TYPE_COMPAT (gimp_fill_type_compat_get_type ())
GType gimp_fill_type_compat_get_type (void) G_GNUC_CONST;
@ -110,16 +146,48 @@ 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
GIMP_ALL_HUES = GIMP_HUE_RANGE_ALL,
GIMP_RED_HUES = GIMP_HUE_RANGE_RED,
GIMP_YELLOW_HUES = GIMP_HUE_RANGE_YELLOW,
GIMP_GREEN_HUES = GIMP_HUE_RANGE_GREEN,
GIMP_CYAN_HUES = GIMP_HUE_RANGE_CYAN,
GIMP_BLUE_HUES = GIMP_HUE_RANGE_BLUE,
GIMP_MAGENTA_HUES = GIMP_HUE_RANGE_MAGENTA
} GimpHueRangeCompat;
#define GIMP_TYPE_ICON_TYPE_COMPAT (gimp_icon_type_compat_get_type ())
GType gimp_icon_type_compat_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_ICON_TYPE_STOCK_ID = GIMP_ICON_TYPE_ICON_NAME
} GimpIconTypeCompat;
#define GIMP_TYPE_INTERPOLATION_TYPE_COMPAT (gimp_interpolation_type_compat_get_type ())
GType gimp_interpolation_type_compat_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_INTERPOLATION_LANCZOS = GIMP_INTERPOLATION_NOHALO
} GimpInterpolationTypeCompat;
#define GIMP_TYPE_TRANSFER_MODE_COMPAT (gimp_transfer_mode_compat_get_type ())
GType gimp_transfer_mode_compat_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_SHADOWS = GIMP_TRANSFER_SHADOWS,
GIMP_MIDTONES = GIMP_TRANSFER_MIDTONES,
GIMP_HIGHLIGHTS = GIMP_TRANSFER_HIGHLIGHTS
} GimpTransferModeCompat;
G_END_DECLS
#endif /* __GIMP_COMPAT_ENUMS_H__ */