[gimp] app: finish GimpLayerColorSpace rename
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: finish GimpLayerColorSpace rename
- Date: Thu, 19 Jan 2017 19:21:21 +0000 (UTC)
commit e9d72ef2a8b40790307e3edfbb20853c983c93d6
Author: Øyvind Kolås <pippin gimp org>
Date: Thu Jan 19 20:17:21 2017 +0100
app: finish GimpLayerColorSpace rename
.../gimpoperationhsvsaturationlegacy.c | 4 ++--
.../gimpoperationhsvvaluelegacy.c | 4 ++--
.../gimpoperationlightenonlylegacy.c | 4 ++--
.../gimpoperationmultiplylegacy.c | 4 ++--
.../layer-modes-legacy/gimpoperationscreenlegacy.c | 4 ++--
.../gimpoperationsoftlightlegacy.c | 4 ++--
.../gimpoperationsubtractlegacy.c | 4 ++--
app/operations/operations-enums.c | 18 +++++++++---------
app/paint/gimppaintcore-loops.c | 4 ++--
9 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
index 196fb93..9fd169f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
@@ -98,8 +98,8 @@ gimp_operation_hsv_saturation_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
index 878cb0f..4e42d50 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
@@ -98,8 +98,8 @@ gimp_operation_hsv_value_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
index 2c8094e..58b832a 100644
--- a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
@@ -94,8 +94,8 @@ gimp_operation_lighten_only_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
index 8fc5fa3..4d4ddef 100644
--- a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
@@ -94,8 +94,8 @@ gimp_operation_multiply_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
index 4c587ec..d969702 100644
--- a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
@@ -94,8 +94,8 @@ gimp_operation_screen_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.c
index 47e522b..a314a3e 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.c
@@ -105,8 +105,8 @@ gimp_operation_softlight_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
index 9261335..8eeb7a2 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
@@ -94,8 +94,8 @@ gimp_operation_subtract_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
index bc9691d..7b4519d 100644
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -9,21 +9,21 @@
/* enumerations from "./operations-enums.h" */
GType
-gimp_layer_blend_trc_get_type (void)
+gimp_layer_color_space_get_type (void)
{
static const GEnumValue values[] =
{
- { GIMP_LAYER_BLEND_RGB_LINEAR, "GIMP_LAYER_BLEND_RGB_LINEAR", "rgb-linear" },
- { GIMP_LAYER_BLEND_RGB_PERCEPTUAL, "GIMP_LAYER_BLEND_RGB_PERCEPTUAL", "rgb-perceptual" },
- { GIMP_LAYER_BLEND_LAB, "GIMP_LAYER_BLEND_LAB", "lab" },
+ { GIMP_LAYER_COLOR_SPACE_RGB_LINEAR, "GIMP_LAYER_COLOR_SPACE_RGB_LINEAR", "rgb-linear" },
+ { GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL, "GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL", "rgb-perceptual" },
+ { GIMP_LAYER_COLOR_SPACE_LAB, "GIMP_LAYER_COLOR_SPACE_LAB", "lab" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
- { GIMP_LAYER_BLEND_RGB_LINEAR, "GIMP_LAYER_BLEND_RGB_LINEAR", NULL },
- { GIMP_LAYER_BLEND_RGB_PERCEPTUAL, "GIMP_LAYER_BLEND_RGB_PERCEPTUAL", NULL },
- { GIMP_LAYER_BLEND_LAB, "GIMP_LAYER_BLEND_LAB", NULL },
+ { GIMP_LAYER_COLOR_SPACE_RGB_LINEAR, "GIMP_LAYER_COLOR_SPACE_RGB_LINEAR", NULL },
+ { GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL, "GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL", NULL },
+ { GIMP_LAYER_COLOR_SPACE_LAB, "GIMP_LAYER_COLOR_SPACE_LAB", NULL },
{ 0, NULL, NULL }
};
@@ -31,8 +31,8 @@ gimp_layer_blend_trc_get_type (void)
if (G_UNLIKELY (! type))
{
- type = g_enum_register_static ("GimpLayerBlendTRC", values);
- gimp_type_set_translation_context (type, "layer-blend-trc");
+ type = g_enum_register_static ("GimpLayerColorSpace", values);
+ gimp_type_set_translation_context (type, "layer-color-space");
gimp_enum_set_value_descriptions (type, descs);
}
diff --git a/app/paint/gimppaintcore-loops.c b/app/paint/gimppaintcore-loops.c
index 22b62c9..3272309 100644
--- a/app/paint/gimppaintcore-loops.c
+++ b/app/paint/gimppaintcore-loops.c
@@ -297,8 +297,8 @@ do_layer_blend (GeglBuffer *src_buffer,
gboolean linear_mode,
GimpLayerMode paint_mode)
{
- GimpLayerBlendTRC blend_trc = GIMP_LAYER_BLEND_RGB_PERCEPTUAL;//XXX
- GimpLayerBlendTRC composite_trc = GIMP_LAYER_BLEND_RGB_LINEAR;//placeholders
+ GimpLayerColorSpace blend_trc = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL;//XXX
+ GimpLayerColorSpace composite_trc = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;//placeholders
GimpLayerCompositeMode composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER;//placeholders
GeglRectangle roi;
GeglRectangle mask_roi;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
