mirror of https://github.com/GNOME/gimp.git
libgimpbase: Replace GimpRGB in gimpchecks
Converted to gdouble[] and updated in all calls to the enums in gegl_color_set_pixel()
This commit is contained in:
parent
c2d8d6c45c
commit
28b236b578
|
@ -138,7 +138,7 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
|
|||
GIMP_CHECK_TYPE_GRAY_CHECKS,
|
||||
GIMP_PARAM_STATIC_STRINGS);
|
||||
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
GIMP_CONFIG_PROP_COLOR (object_class, PROP_TRANSPARENCY_CUSTOM_COLOR1,
|
||||
"transparency-custom-color1",
|
||||
_("Transparency custom color 1"),
|
||||
|
@ -146,7 +146,7 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
|
|||
color,
|
||||
GIMP_PARAM_STATIC_STRINGS);
|
||||
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
GIMP_CONFIG_PROP_COLOR (object_class, PROP_TRANSPARENCY_CUSTOM_COLOR2,
|
||||
"transparency-custom-color2",
|
||||
_("Transparency custom color 2"),
|
||||
|
@ -413,11 +413,11 @@ gimp_display_config_init (GimpDisplayConfig *config)
|
|||
GeglColor *color;
|
||||
|
||||
color = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
config->transparency_custom_color1 = color;
|
||||
|
||||
color = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
config->transparency_custom_color2 = color;
|
||||
|
||||
config->default_view =
|
||||
|
|
|
@ -47,9 +47,9 @@ gimp_render_init (Gimp *gimp)
|
|||
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
||||
|
||||
color1 = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
gegl_color_set_pixel (color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
color2 = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
gegl_color_set_pixel (color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
|
||||
g_signal_connect (gimp->config, "notify::transparency-type",
|
||||
G_CALLBACK (gimp_render_setup_notify),
|
||||
|
|
|
@ -1124,7 +1124,7 @@ _gimp_config (GPConfig *config)
|
|||
{
|
||||
g_warning ("%s: checker board color 1's format expects %d bpp but %" G_GSIZE_FORMAT " bytes were passed.",
|
||||
G_STRFUNC, babl_format_get_bytes_per_pixel (format), bpp);
|
||||
gegl_color_set_pixel (_check_custom_color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
gegl_color_set_pixel (_check_custom_color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1143,7 +1143,7 @@ _gimp_config (GPConfig *config)
|
|||
{
|
||||
g_warning ("%s: checker board color 2's format expects %d bpp but %" G_GSIZE_FORMAT " bytes were passed.",
|
||||
G_STRFUNC, babl_format_get_bytes_per_pixel (format), bpp);
|
||||
gegl_color_set_pixel (_check_custom_color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
gegl_color_set_pixel (_check_custom_color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -73,25 +73,25 @@ gimp_checks_get_colors (GimpCheckType type,
|
|||
switch (type)
|
||||
{
|
||||
case GIMP_CHECK_TYPE_LIGHT_CHECKS:
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_LIGHT_COLOR_LIGHT);
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_LIGHT_COLOR_LIGHT);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_DARK_CHECKS:
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_DARK_COLOR_LIGHT);
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_DARK_COLOR_LIGHT);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_WHITE_ONLY:
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_WHITE_COLOR);
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_WHITE_COLOR);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_GRAY_ONLY:
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_GRAY_COLOR);
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_GRAY_COLOR);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_BLACK_ONLY:
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_BLACK_COLOR);
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_BLACK_COLOR);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_CUSTOM_CHECKS:
|
||||
/* Keep the current value. */
|
||||
break;
|
||||
default:
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_GRAY_COLOR_LIGHT);
|
||||
gegl_color_set_pixel (*color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_GRAY_COLOR_LIGHT);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -102,25 +102,25 @@ gimp_checks_get_colors (GimpCheckType type,
|
|||
switch (type)
|
||||
{
|
||||
case GIMP_CHECK_TYPE_LIGHT_CHECKS:
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_LIGHT_COLOR_DARK);
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_LIGHT_COLOR_DARK);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_DARK_CHECKS:
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_DARK_COLOR_DARK);
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_DARK_COLOR_DARK);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_WHITE_ONLY:
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_WHITE_COLOR);
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_WHITE_COLOR);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_GRAY_ONLY:
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_GRAY_COLOR);
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_GRAY_COLOR);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_BLACK_ONLY:
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_BLACK_COLOR);
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_BLACK_COLOR);
|
||||
break;
|
||||
case GIMP_CHECK_TYPE_CUSTOM_CHECKS:
|
||||
/* Keep the current value. */
|
||||
break;
|
||||
default:
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_GRAY_COLOR_DARK);
|
||||
gegl_color_set_pixel (*color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_GRAY_COLOR_DARK);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -62,63 +62,63 @@ G_BEGIN_DECLS
|
|||
*
|
||||
* The dark color for the light checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_LIGHT_COLOR_DARK ((GimpRGB) { 0.8, 0.8, 0.8, 1.0 })
|
||||
#define GIMP_CHECKS_LIGHT_COLOR_DARK ((gdouble[]) { 0.8, 0.8, 0.8, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_LIGHT_COLOR_LIGHT:
|
||||
*
|
||||
* The light color for the light checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_LIGHT_COLOR_LIGHT ((GimpRGB) { 1.0, 1.0, 1.0, 1.0 })
|
||||
#define GIMP_CHECKS_LIGHT_COLOR_LIGHT ((gdouble[]) { 1.0, 1.0, 1.0, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_GRAY_COLOR_DARK:
|
||||
*
|
||||
* The dark color for the gray checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_GRAY_COLOR_DARK ((GimpRGB) { 0.4, 0.4, 0.4, 1.0 })
|
||||
#define GIMP_CHECKS_GRAY_COLOR_DARK ((gdouble[]) { 0.4, 0.4, 0.4, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_GRAY_COLOR_LIGHT:
|
||||
*
|
||||
* The light color for the gray checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_GRAY_COLOR_LIGHT ((GimpRGB) { 0.6, 0.6, 0.6, 1.0 })
|
||||
#define GIMP_CHECKS_GRAY_COLOR_LIGHT ((gdouble[]) { 0.6, 0.6, 0.6, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_DARK_COLOR_DARK:
|
||||
*
|
||||
* The dark color for the dark checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_DARK_COLOR_DARK ((GimpRGB) { 0.0, 0.0, 0.0, 1.0 })
|
||||
#define GIMP_CHECKS_DARK_COLOR_DARK ((gdouble[]) { 0.0, 0.0, 0.0, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_DARK_COLOR_LIGHT:
|
||||
*
|
||||
* The light color for the dark checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_DARK_COLOR_LIGHT ((GimpRGB) { 0.2, 0.2, 0.2, 1.0 })
|
||||
#define GIMP_CHECKS_DARK_COLOR_LIGHT ((gdouble[]) { 0.2, 0.2, 0.2, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_WHITE_COLOR:
|
||||
*
|
||||
* The light/dark color for the white checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_WHITE_COLOR ((GimpRGB) { 1.0, 1.0, 1.0, 1.0 })
|
||||
#define GIMP_CHECKS_WHITE_COLOR ((gdouble[]) { 1.0, 1.0, 1.0, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_GRAY_COLOR:
|
||||
*
|
||||
* The light/dark color for the gray checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_GRAY_COLOR ((GimpRGB) { 0.5, 0.5, 0.5, 1.0 })
|
||||
#define GIMP_CHECKS_GRAY_COLOR ((gdouble[]) { 0.5, 0.5, 0.5, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_BLACK_COLOR:
|
||||
*
|
||||
* The light/dark color for the black checkerboard type.
|
||||
**/
|
||||
#define GIMP_CHECKS_BLACK_COLOR ((GimpRGB) { 0.0, 0.0, 0.0, 1.0 })
|
||||
#define GIMP_CHECKS_BLACK_COLOR ((gdouble[]) { 0.0, 0.0, 0.0, 1.0 })
|
||||
|
||||
/**
|
||||
* GIMP_CHECKS_CUSTOM_COLOR1:
|
||||
|
|
|
@ -36,9 +36,9 @@
|
|||
/**
|
||||
* SECTION: gimpcellrenderercolor
|
||||
* @title: GimpCellRendererColor
|
||||
* @short_description: A #GtkCellRenderer to display a #GimpRGB color.
|
||||
* @short_description: A #GtkCellRenderer to display a #GeglColor color.
|
||||
*
|
||||
* A #GtkCellRenderer to display a #GimpRGB color.
|
||||
* A #GtkCellRenderer to display a #GeglColor color.
|
||||
**/
|
||||
|
||||
|
||||
|
|
|
@ -138,9 +138,9 @@ gimp_preview_area_class_init (GimpPreviewAreaClass *klass)
|
|||
gegl_init (NULL, NULL);
|
||||
|
||||
color1_default = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (color1_default, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
gegl_color_set_pixel (color1_default, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
color2_default = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (color2_default, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
gegl_color_set_pixel (color2_default, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
|
||||
object_class->dispose = gimp_preview_area_dispose;
|
||||
object_class->finalize = gimp_preview_area_finalize;
|
||||
|
@ -196,9 +196,9 @@ gimp_preview_area_init (GimpPreviewArea *area)
|
|||
priv->check_size = DEFAULT_CHECK_SIZE;
|
||||
priv->check_type = DEFAULT_CHECK_TYPE;
|
||||
priv->check_custom_color1 = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (priv->check_custom_color1, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
gegl_color_set_pixel (priv->check_custom_color1, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR1);
|
||||
priv->check_custom_color2 = gegl_color_new (NULL);
|
||||
gegl_color_set_pixel (priv->check_custom_color2, babl_format ("R'G'B'A double"), &GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
gegl_color_set_pixel (priv->check_custom_color2, babl_format ("R'G'B'A double"), GIMP_CHECKS_CUSTOM_COLOR2);
|
||||
priv->max_width = -1;
|
||||
priv->max_height = -1;
|
||||
|
||||
|
|
Loading…
Reference in New Issue