[gimp] app: remove premultiplied blending code from the few ops that had it
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: remove premultiplied blending code from the few ops that had it
- Date: Thu, 13 Dec 2012 22:01:09 +0000 (UTC)
commit 9b6703371e40cd230458751c97f053e46896cbf1
Author: Michael Natterer <mitch gimp org>
Date: Thu Dec 13 22:58:38 2012 +0100
app: remove premultiplied blending code from the few ops that had it
Change GimpOperationPointLayerMode's "premultiplied" to "linear" and
set format to "RGBA float" if it's TRUE. Everything defaults to FALSE
so nothing changes.
app/gegl/gimp-gegl-nodes.c | 8 ++--
app/gegl/gimp-gegl-nodes.h | 2 +-
app/operations/gimpoperationbehindmode.c | 66 +++++++----------------
app/operations/gimpoperationerasemode.c | 56 +++++--------------
app/operations/gimpoperationnormalmode.c | 75 ++++++++------------------
app/operations/gimpoperationpointlayermode.c | 18 +++---
app/operations/gimpoperationpointlayermode.h | 2 +-
7 files changed, 71 insertions(+), 156 deletions(-)
---
diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c
index d5f75a8..ce11fe7 100644
--- a/app/gegl/gimp-gegl-nodes.c
+++ b/app/gegl/gimp-gegl-nodes.c
@@ -266,7 +266,7 @@ void
gimp_gegl_mode_node_set (GeglNode *node,
GimpLayerModeEffects mode,
gdouble opacity,
- gboolean premultiplied)
+ gboolean linear)
{
const gchar *operation = "gimp:normal-mode";
@@ -305,9 +305,9 @@ gimp_gegl_mode_node_set (GeglNode *node,
}
gegl_node_set (node,
- "operation", operation,
- "opacity", opacity,
- "premultiplied", premultiplied,
+ "operation", operation,
+ "opacity", opacity,
+ "linear", linear,
NULL);
}
diff --git a/app/gegl/gimp-gegl-nodes.h b/app/gegl/gimp-gegl-nodes.h
index f79db82..5ea13ab 100644
--- a/app/gegl/gimp-gegl-nodes.h
+++ b/app/gegl/gimp-gegl-nodes.h
@@ -49,7 +49,7 @@ GeglNode * gimp_gegl_add_buffer_source (GeglNode *parent,
void gimp_gegl_mode_node_set (GeglNode *node,
GimpLayerModeEffects mode,
gdouble opacity,
- gboolean premultiplied);
+ gboolean linear);
void gimp_gegl_node_set_matrix (GeglNode *node,
const GimpMatrix3 *matrix);
diff --git a/app/operations/gimpoperationbehindmode.c b/app/operations/gimpoperationbehindmode.c
index 7d833fc..3825a29 100644
--- a/app/operations/gimpoperationbehindmode.c
+++ b/app/operations/gimpoperationbehindmode.c
@@ -83,63 +83,37 @@ gimp_operation_behind_mode_process (GeglOperation *operation,
gfloat *out = out_buf;
const gboolean has_mask = mask != NULL;
- if (point->premultiplied)
+ while (samples--)
{
- while (samples--)
- {
- gint b;
- gdouble value = opacity;
-
- if (has_mask)
- value *= *mask;
+ gint b;
+ gdouble value = opacity;
- for (b = RED; b <= ALPHA; b++)
- {
- out[b] = in[b] + layer[b] * value * (1.0 - in[ALPHA]);
- }
+ if (has_mask)
+ value *= *mask;
- in += 4;
- layer += 4;
- out += 4;
+ out[ALPHA] = in[ALPHA] + (1.0 - in[ALPHA]) * layer[ALPHA] * value;
- if (has_mask)
- mask++;
- }
- }
- else
- {
- while (samples--)
+ if (out[ALPHA])
{
- gint b;
- gdouble value = opacity;
-
- if (has_mask)
- value *= *mask;
-
- out[ALPHA] = in[ALPHA] + (1.0 - in[ALPHA]) * layer[ALPHA] * value;
-
- if (out[ALPHA])
+ for (b = RED; b < ALPHA; b++)
{
- for (b = RED; b < ALPHA; b++)
- {
- out[b] = (in[b] * in[ALPHA] + layer[b] * value * layer[ALPHA] * value * (1.0 - in[ALPHA])) / out[ALPHA];
- }
+ out[b] = (in[b] * in[ALPHA] + layer[b] * value * layer[ALPHA] * value * (1.0 - in[ALPHA])) / out[ALPHA];
}
- else
+ }
+ else
+ {
+ for (b = RED; b <= ALPHA; b++)
{
- for (b = RED; b <= ALPHA; b++)
- {
- out[b] = in[b];
- }
+ out[b] = in[b];
}
+ }
- in += 4;
- layer += 4;
- out += 4;
+ in += 4;
+ layer += 4;
+ out += 4;
- if (has_mask)
- mask++;
- }
+ if (has_mask)
+ mask++;
}
return TRUE;
diff --git a/app/operations/gimpoperationerasemode.c b/app/operations/gimpoperationerasemode.c
index 1947783..f20ee06 100644
--- a/app/operations/gimpoperationerasemode.c
+++ b/app/operations/gimpoperationerasemode.c
@@ -96,55 +96,27 @@ gimp_operation_erase_mode_process (GeglOperation *operation,
gfloat *out = out_buf;
const gboolean has_mask = mask != NULL;
- if (point->premultiplied)
+ while (samples--)
{
- while (samples--)
- {
- gint b;
- gdouble value = opacity;
-
- if (has_mask)
- value *= (*mask);
-
- out[ALPHA] = in[ALPHA] - in[ALPHA] * layer[ALPHA] * value;
+ gint b;
+ gdouble value = opacity;
- for (b = RED; b < ALPHA; b++)
- {
- out[b] = in[b] / in[ALPHA] * out[ALPHA];
- }
+ if (has_mask)
+ value *= (*mask);
- in += 4;
- layer += 4;
- out += 4;
-
- if (has_mask)
- mask ++;
- }
- }
- else
- {
- while (samples--)
+ for (b = RED; b < ALPHA; b++)
{
- gint b;
- gdouble value = opacity;
-
- if (has_mask)
- value *= (*mask);
-
- for (b = RED; b < ALPHA; b++)
- {
- out[b] = in[b];
- }
+ out[b] = in[b];
+ }
- out[ALPHA] = in[ALPHA] - in[ALPHA] * layer[ALPHA] * value;
+ out[ALPHA] = in[ALPHA] - in[ALPHA] * layer[ALPHA] * value;
- in += 4;
- layer += 4;
- out += 4;
+ in += 4;
+ layer += 4;
+ out += 4;
- if (has_mask)
- mask ++;
- }
+ if (has_mask)
+ mask ++;
}
return TRUE;
diff --git a/app/operations/gimpoperationnormalmode.c b/app/operations/gimpoperationnormalmode.c
index 34a5424..11f3075 100644
--- a/app/operations/gimpoperationnormalmode.c
+++ b/app/operations/gimpoperationnormalmode.c
@@ -162,72 +162,41 @@ gimp_operation_normal_mode_process (GeglOperation *operation,
gfloat *out = out_buf;
const gboolean has_mask = mask != NULL;
- if (point->premultiplied)
+ while (samples--)
{
- while (samples--)
- {
- gdouble value;
- gfloat aux_alpha;
- gint b;
+ gfloat aux_alpha;
+
+ aux_alpha = aux[ALPHA] * opacity;
+ if (has_mask)
+ aux_alpha *= *mask;
- value = opacity;
- if (has_mask)
- value *= *mask;
- aux_alpha = aux[ALPHA] * value;
+ out[ALPHA] = aux_alpha + in[ALPHA] - aux_alpha * in[ALPHA];
+
+ if (out[ALPHA])
+ {
+ gint b;
for (b = RED; b < ALPHA; b++)
{
- out[b] = aux[b] * value + in[b] * (1.0f - aux_alpha);
+ out[b] = (aux[b] * aux_alpha + in[b] * in[ALPHA] * (1.0f - aux_alpha)) / out[ALPHA];
}
-
- out[ALPHA] = aux_alpha + in[ALPHA] - aux_alpha * in[ALPHA];
-
- in += 4;
- aux += 4;
- out += 4;
-
- if (has_mask)
- mask++;
}
- }
- else
- {
- while (samples--)
+ else
{
- gfloat aux_alpha;
+ gint b;
- aux_alpha = aux[ALPHA] * opacity;
- if (has_mask)
- aux_alpha *= *mask;
-
- out[ALPHA] = aux_alpha + in[ALPHA] - aux_alpha * in[ALPHA];
-
- if (out[ALPHA])
- {
- gint b;
-
- for (b = RED; b < ALPHA; b++)
- {
- out[b] = (aux[b] * aux_alpha + in[b] * in[ALPHA] * (1.0f - aux_alpha)) / out[ALPHA];
- }
- }
- else
+ for (b = RED; b < ALPHA; b++)
{
- gint b;
-
- for (b = RED; b < ALPHA; b++)
- {
- out[b] = in[b];
- }
+ out[b] = in[b];
}
+ }
- in += 4;
- aux += 4;
- out += 4;
+ in += 4;
+ aux += 4;
+ out += 4;
- if (has_mask)
- mask++;
- }
+ if (has_mask)
+ mask++;
}
return TRUE;
diff --git a/app/operations/gimpoperationpointlayermode.c b/app/operations/gimpoperationpointlayermode.c
index 4494c2e..cdfae82 100644
--- a/app/operations/gimpoperationpointlayermode.c
+++ b/app/operations/gimpoperationpointlayermode.c
@@ -35,7 +35,7 @@
enum
{
PROP_0,
- PROP_PREMULTIPLIED,
+ PROP_LINEAR,
PROP_OPACITY
};
@@ -73,8 +73,8 @@ gimp_operation_point_layer_mode_class_init (GimpOperationPointLayerModeClass *kl
"categories", "compositors",
NULL);
- g_object_class_install_property (object_class, PROP_PREMULTIPLIED,
- g_param_spec_boolean ("premultiplied",
+ g_object_class_install_property (object_class, PROP_LINEAR,
+ g_param_spec_boolean ("linear",
NULL, NULL,
FALSE,
GIMP_PARAM_READWRITE |
@@ -103,8 +103,8 @@ gimp_operation_point_layer_mode_set_property (GObject *object,
switch (property_id)
{
- case PROP_PREMULTIPLIED:
- self->premultiplied = g_value_get_boolean (value);
+ case PROP_LINEAR:
+ self->linear = g_value_get_boolean (value);
break;
case PROP_OPACITY:
@@ -127,8 +127,8 @@ gimp_operation_point_layer_mode_get_property (GObject *object,
switch (property_id)
{
- case PROP_PREMULTIPLIED:
- g_value_set_boolean (value, self->premultiplied);
+ case PROP_LINEAR:
+ g_value_set_boolean (value, self->linear);
break;
case PROP_OPACITY:
@@ -147,8 +147,8 @@ gimp_operation_point_layer_mode_prepare (GeglOperation *operation)
GimpOperationPointLayerMode *self = GIMP_OPERATION_POINT_LAYER_MODE (operation);
const Babl *format;
- if (self->premultiplied)
- format = babl_format ("R'aG'aB'aA float");
+ if (self->linear)
+ format = babl_format ("RGBA float");
else
format = babl_format ("R'G'B'A float");
diff --git a/app/operations/gimpoperationpointlayermode.h b/app/operations/gimpoperationpointlayermode.h
index 51fd97b..86de217 100644
--- a/app/operations/gimpoperationpointlayermode.h
+++ b/app/operations/gimpoperationpointlayermode.h
@@ -41,7 +41,7 @@ struct _GimpOperationPointLayerMode
{
GeglOperationPointComposer3 parent_instance;
- gboolean premultiplied;
+ gboolean linear;
gdouble opacity;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
