Commit bff64411 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/base/base-enums.h moved GimpInterpolationType and GimpTransferMode to

2005-01-23  Sven Neumann  <sven@gimp.org>

	* app/base/base-enums.h
	* libgimpbase/gimpbaseenums.h: moved GimpInterpolationType and
	GimpTransferMode to libgimpbase (from core and libgimp). The
	remaining enums in app/base/base-enums.h need special treatment.

	* app/base/base-enums.c
	* libgimp/gimpenums.h
	* libgimpbase/gimpbaseenums.[ch]
	* tools/pdbgen/enums.pl: regenerated.

	* libgimpbase/gimpbase.def
	* libgimp/gimp.def: updated.
parent 5c15a615
2005-01-23 Sven Neumann <sven@gimp.org>
* app/base/base-enums.h
* libgimpbase/gimpbaseenums.h: moved GimpInterpolationType and
GimpTransferMode to libgimpbase (from core and libgimp). The
remaining enums in app/base/base-enums.h need special treatment.
* app/base/base-enums.c
* libgimp/gimpenums.h
* libgimpbase/gimpbaseenums.[ch]
* tools/pdbgen/enums.pl: regenerated.
* libgimpbase/gimpbase.def
* libgimp/gimp.def: updated.
2005-01-22 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu-enums.h
......
......@@ -72,38 +72,6 @@ gimp_histogram_channel_get_type (void)
return type;
}
GType
gimp_interpolation_type_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_INTERPOLATION_NONE, "GIMP_INTERPOLATION_NONE", "none" },
{ GIMP_INTERPOLATION_LINEAR, "GIMP_INTERPOLATION_LINEAR", "linear" },
{ GIMP_INTERPOLATION_CUBIC, "GIMP_INTERPOLATION_CUBIC", "cubic" },
{ GIMP_INTERPOLATION_LANCZOS, "GIMP_INTERPOLATION_LANCZOS", "lanczos" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_INTERPOLATION_NONE, N_("None (Fastest)"), NULL },
{ GIMP_INTERPOLATION_LINEAR, N_("Linear"), NULL },
{ GIMP_INTERPOLATION_CUBIC, N_("Cubic"), NULL },
{ GIMP_INTERPOLATION_LANCZOS, N_("Lanczos (Best)"), NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (! type)
{
type = g_enum_register_static ("GimpInterpolationType", values);
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_layer_mode_effects_get_type (void)
{
......
......@@ -61,19 +61,6 @@ typedef enum
} GimpHistogramChannel;
#define GIMP_TYPE_INTERPOLATION_TYPE (gimp_interpolation_type_get_type ())
GType gimp_interpolation_type_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_INTERPOLATION_NONE, /*< desc="None (Fastest)" >*/
GIMP_INTERPOLATION_LINEAR, /*< desc="Linear" >*/
GIMP_INTERPOLATION_CUBIC, /*< desc="Cubic" >*/
GIMP_INTERPOLATION_LANCZOS /*< desc="Lanczos (Best)" >*/
} GimpInterpolationType;
#define GIMP_TYPE_LAYER_MODE_EFFECTS (gimp_layer_mode_effects_get_type ())
GType gimp_layer_mode_effects_get_type (void) G_GNUC_CONST;
......@@ -109,18 +96,6 @@ typedef enum
} GimpLayerModeEffects;
#define GIMP_TYPE_TRANSFER_MODE (gimp_transfer_mode_get_type ())
GType gimp_transfer_mode_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_SHADOWS, /*< desc="Shadows" >*/
GIMP_MIDTONES, /*< desc="Midtones" >*/
GIMP_HIGHLIGHTS /*< desc="Highlights" >*/
} GimpTransferMode;
/*
* non-registered enums; register them if needed
*/
......
......@@ -349,7 +349,6 @@ EXPORTS
gimp_install_cmap
gimp_install_procedure
gimp_install_temp_proc
gimp_interpolation_type_get_type
gimp_invert
gimp_layer_add_alpha
gimp_layer_add_mask
......@@ -555,7 +554,6 @@ EXPORTS
gimp_tile_ref_zero
gimp_tile_unref
gimp_tile_width
gimp_transfer_mode_get_type
gimp_transform_2d
gimp_transform_direction_get_type
gimp_uninstall_temp_proc
......
......@@ -278,19 +278,6 @@ typedef enum
} GimpIconType;
#define GIMP_TYPE_INTERPOLATION_TYPE (gimp_interpolation_type_get_type ())
GType gimp_interpolation_type_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_INTERPOLATION_NONE,
GIMP_INTERPOLATION_LINEAR,
GIMP_INTERPOLATION_CUBIC,
GIMP_INTERPOLATION_LANCZOS
} GimpInterpolationType;
#define GIMP_TYPE_LAYER_MODE_EFFECTS (gimp_layer_mode_effects_get_type ())
GType gimp_layer_mode_effects_get_type (void) G_GNUC_CONST;
......@@ -428,18 +415,6 @@ typedef enum
} GimpSizeType;
#define GIMP_TYPE_TRANSFER_MODE (gimp_transfer_mode_get_type ())
GType gimp_transfer_mode_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_SHADOWS,
GIMP_MIDTONES,
GIMP_HIGHLIGHTS
} GimpTransferMode;
#define GIMP_TYPE_TRANSFORM_DIRECTION (gimp_transform_direction_get_type ())
GType gimp_transform_direction_get_type (void) G_GNUC_CONST;
......
......@@ -26,6 +26,7 @@ EXPORTS
gimp_gtkrc
gimp_image_base_type_get_type
gimp_image_type_get_type
gimp_interpolation_type_get_type
gimp_locale_directory
gimp_memsize_deserialize
gimp_memsize_get_type
......@@ -33,12 +34,12 @@ EXPORTS
gimp_memsize_to_string
gimp_message_handler_type_get_type
gimp_param_memsize_get_type
gimp_param_spec_memsize
gimp_param_path_get_type
gimp_param_spec_memsize
gimp_param_spec_path
gimp_param_spec_path_type
gimp_param_unit_get_type
gimp_param_spec_unit
gimp_param_unit_get_type
gimp_parasite_compare
gimp_parasite_copy
gimp_parasite_data
......@@ -69,6 +70,7 @@ EXPORTS
gimp_stack_trace_mode_get_type
gimp_strip_uline
gimp_sysconf_directory
gimp_transfer_mode_get_type
gimp_type_get_translation_domain
gimp_type_set_translation_domain
gimp_unit_get_abbreviation
......
......@@ -143,6 +143,70 @@ gimp_image_type_get_type (void)
return type;
}
GType
gimp_interpolation_type_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_INTERPOLATION_NONE, "GIMP_INTERPOLATION_NONE", "none" },
{ GIMP_INTERPOLATION_LINEAR, "GIMP_INTERPOLATION_LINEAR", "linear" },
{ GIMP_INTERPOLATION_CUBIC, "GIMP_INTERPOLATION_CUBIC", "cubic" },
{ GIMP_INTERPOLATION_LANCZOS, "GIMP_INTERPOLATION_LANCZOS", "lanczos" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_INTERPOLATION_NONE, N_("None (Fastest)"), NULL },
{ GIMP_INTERPOLATION_LINEAR, N_("Linear"), NULL },
{ GIMP_INTERPOLATION_CUBIC, N_("Cubic"), NULL },
{ GIMP_INTERPOLATION_LANCZOS, N_("Lanczos (Best)"), NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (! type)
{
type = g_enum_register_static ("GimpInterpolationType", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_transfer_mode_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, N_("Shadows"), NULL },
{ GIMP_MIDTONES, N_("Midtones"), NULL },
{ GIMP_HIGHLIGHTS, N_("Highlights"), NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (! type)
{
type = g_enum_register_static ("GimpTransferMode", values);
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_pdb_arg_type_get_type (void)
{
......
......@@ -80,6 +80,31 @@ typedef enum
} GimpImageType;
#define GIMP_TYPE_INTERPOLATION_TYPE (gimp_interpolation_type_get_type ())
GType gimp_interpolation_type_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_INTERPOLATION_NONE, /*< desc="None (Fastest)" >*/
GIMP_INTERPOLATION_LINEAR, /*< desc="Linear" >*/
GIMP_INTERPOLATION_CUBIC, /*< desc="Cubic" >*/
GIMP_INTERPOLATION_LANCZOS /*< desc="Lanczos (Best)" >*/
} GimpInterpolationType;
#define GIMP_TYPE_TRANSFER_MODE (gimp_transfer_mode_get_type ())
GType gimp_transfer_mode_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_SHADOWS, /*< desc="Shadows" >*/
GIMP_MIDTONES, /*< desc="Midtones" >*/
GIMP_HIGHLIGHTS /*< desc="Highlights" >*/
} GimpTransferMode;
typedef enum /*< skip >*/
{
GIMP_UNIT_PIXEL = 0,
......
......@@ -41,6 +41,25 @@ package Gimp::CodeGen::enums;
GIMP_INDEXED_IMAGE => '4',
GIMP_INDEXEDA_IMAGE => '5' }
},
GimpInterpolationType =>
{ contig => 1,
header => 'libgimpbase/gimpbaseenums.h',
symbols => [ qw(GIMP_INTERPOLATION_NONE GIMP_INTERPOLATION_LINEAR
GIMP_INTERPOLATION_CUBIC
GIMP_INTERPOLATION_LANCZOS) ],
mapping => { GIMP_INTERPOLATION_NONE => '0',
GIMP_INTERPOLATION_LINEAR => '1',
GIMP_INTERPOLATION_CUBIC => '2',
GIMP_INTERPOLATION_LANCZOS => '3' }
},
GimpTransferMode =>
{ contig => 1,
header => 'libgimpbase/gimpbaseenums.h',
symbols => [ qw(GIMP_SHADOWS GIMP_MIDTONES GIMP_HIGHLIGHTS) ],
mapping => { GIMP_SHADOWS => '0',
GIMP_MIDTONES => '1',
GIMP_HIGHLIGHTS => '2' }
},
GimpUnit =>
{ contig => 1,
header => 'libgimpbase/gimpbaseenums.h',
......@@ -152,17 +171,6 @@ package Gimp::CodeGen::enums;
GIMP_HISTOGRAM_BLUE => '3',
GIMP_HISTOGRAM_ALPHA => '4' }
},
GimpInterpolationType =>
{ contig => 1,
header => 'base/base-enums.h',
symbols => [ qw(GIMP_INTERPOLATION_NONE GIMP_INTERPOLATION_LINEAR
GIMP_INTERPOLATION_CUBIC
GIMP_INTERPOLATION_LANCZOS) ],
mapping => { GIMP_INTERPOLATION_NONE => '0',
GIMP_INTERPOLATION_LINEAR => '1',
GIMP_INTERPOLATION_CUBIC => '2',
GIMP_INTERPOLATION_LANCZOS => '3' }
},
GimpLayerModeEffects =>
{ contig => 1,
header => 'base/base-enums.h',
......@@ -201,14 +209,6 @@ package Gimp::CodeGen::enums;
GIMP_GRAIN_MERGE_MODE => '21',
GIMP_COLOR_ERASE_MODE => '22' }
},
GimpTransferMode =>
{ contig => 1,
header => 'base/base-enums.h',
symbols => [ qw(GIMP_SHADOWS GIMP_MIDTONES GIMP_HIGHLIGHTS) ],
mapping => { GIMP_SHADOWS => '0',
GIMP_MIDTONES => '1',
GIMP_HIGHLIGHTS => '2' }
},
GimpConvolutionType =>
{ contig => 1,
header => 'base/base-enums.h',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment