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

app: added gegl version of lighten only blending mode

Browse Source
This commit is contained in:
Ville Sokk
2012-04-17 23:00:28 +03:00
committed by Michael Natterer
parent 6d1776d354
commit e4d97f9a95
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/gegl/gimp-gegl-nodes.c
View File

@ -257,7 +257,6 @@ gimp_gegl_node_set_layer_mode (GeglNode *node,
case GIMP_ADDITION_MODE: case GIMP_ADDITION_MODE:
case GIMP_SUBTRACT_MODE: case GIMP_SUBTRACT_MODE:
case GIMP_DARKEN_ONLY_MODE: case GIMP_DARKEN_ONLY_MODE:
case GIMP_LIGHTEN_ONLY_MODE:
case GIMP_HUE_MODE: case GIMP_HUE_MODE:
case GIMP_SATURATION_MODE: case GIMP_SATURATION_MODE:
case GIMP_COLOR_MODE: case GIMP_COLOR_MODE:
@ -296,7 +295,7 @@ gimp_gegl_node_set_layer_mode (GeglNode *node,
case GIMP_ADDITION_MODE: operation = "gimp:addition-mode"; break; case GIMP_ADDITION_MODE: operation = "gimp:addition-mode"; break;
case GIMP_SUBTRACT_MODE: operation = "gimp:subtract-mode"; break; case GIMP_SUBTRACT_MODE: operation = "gimp:subtract-mode"; break;
case GIMP_DARKEN_ONLY_MODE: operation = "gimp:darken-mode"; break; case GIMP_DARKEN_ONLY_MODE: operation = "gimp:darken-mode"; break;
case GIMP_LIGHTEN_ONLY_MODE: operation = "gimp:lighten-mode"; break; case GIMP_LIGHTEN_ONLY_MODE: operation = "gimp:lighten-only-mode"; break;
case GIMP_HUE_MODE: operation = "gimp:hue-mode"; break; case GIMP_HUE_MODE: operation = "gimp:hue-mode"; break;
case GIMP_SATURATION_MODE: operation = "gimp:saturation-mode"; break; case GIMP_SATURATION_MODE: operation = "gimp:saturation-mode"; break;
case GIMP_COLOR_MODE: operation = "gimp:color-mode"; break; case GIMP_COLOR_MODE: operation = "gimp:color-mode"; break;

27
app/gegl/gimpoperationlightenonlymode.c
View File

@ -3,6 +3,7 @@
* *
* gimpoperationlightenonlymode.c * gimpoperationlightenonlymode.c
* Copyright (C) 2008 Michael Natterer <mitch@gimp.org> * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
* 2012 Ville Sokk <ville.sokk@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -40,6 +41,14 @@ static gboolean gimp_operation_lighten_only_mode_process (GeglOperation *o
G_DEFINE_TYPE (GimpOperationLightenOnlyMode, gimp_operation_lighten_only_mode, G_DEFINE_TYPE (GimpOperationLightenOnlyMode, gimp_operation_lighten_only_mode,
GIMP_TYPE_OPERATION_POINT_LAYER_MODE) GIMP_TYPE_OPERATION_POINT_LAYER_MODE)
static void prepare (GeglOperation *operation)
{
const Babl *format = babl_format ("R'G'B'A float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format);
gegl_operation_set_format (operation, "output", format);
}
static void static void
gimp_operation_lighten_only_mode_class_init (GimpOperationLightenOnlyModeClass *klass) gimp_operation_lighten_only_mode_class_init (GimpOperationLightenOnlyModeClass *klass)
@ -56,6 +65,7 @@ gimp_operation_lighten_only_mode_class_init (GimpOperationLightenOnlyModeClass *
NULL); NULL);
point_class->process = gimp_operation_lighten_only_mode_process; point_class->process = gimp_operation_lighten_only_mode_process;
operation_class->prepare = prepare;
} }
static void static void
@ -69,7 +79,7 @@ gimp_operation_lighten_only_mode_process (GeglOperation *operation,
void *aux_buf, void *aux_buf,
void *out_buf, void *out_buf,
glong samples, glong samples,
const GeglRectangle *roi, const GeglRectangle *result,
gint level) gint level)
{ {
gfloat *in = in_buf; gfloat *in = in_buf;
@ -78,11 +88,20 @@ gimp_operation_lighten_only_mode_process (GeglOperation *operation,
while (samples--) while (samples--)
{ {
out[RED] = in[RED]; gint b;
out[GREEN] = in[GREEN]; gfloat comp_alpha = MIN (in[ALPHA] * layer[ALPHA], layer[ALPHA] * in[ALPHA]);
out[BLUE] = in[BLUE]; gfloat new_alpha = in[ALPHA] + (1 - in[ALPHA]) * comp_alpha;
gfloat ratio = comp_alpha / new_alpha;
out[ALPHA] = in[ALPHA]; out[ALPHA] = in[ALPHA];
for (b = RED; b < ALPHA; b++)
{
gfloat comp = MAX (layer[b], in[b]);
out[b] = comp * ratio + in[b] * (1 - ratio);
}
in += 4; in += 4;
layer += 4; layer += 4;
out += 4; out += 4;