dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Continue the quest of overviewable and readable blend formulas. The macro 

* app/gegl/gimpoperationpointlayermode.c: Continue the quest of
overviewable and readable blend formulas. The macro now expands to
entire case-statements.

svn path=/trunk/; revision=27420
This commit is contained in:
Martin Nordholts 2008-10-26 17:43:46 +00:00
parent ee414d9e6f
commit 65714a8ceb
2 changed files with 88 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-10-26 Martin Nordholts <martinn@svn.gnome.org>
* app/gegl/gimpoperationpointlayermode.c: Continue the quest of
overviewable and readable blend formulas. The macro now expands to
entire case-statements.
2008-10-26 Michael Natterer <mitch@gimp.org>
Merge on-canvas GSoC project:

162
app/gegl/gimpoperationpointlayermode.c
View File

@ -40,12 +40,13 @@
#define outC out[c]
#define outA out[A]
#define EXPAND(expr) \
for (c = RED; c < ALPHA; c++) \
{ \
expr; \
}
#define BLEND(mode, expr) \
case (mode): \
for (c = RED; c < ALPHA; c++) \
{ \
expr; \
} \
break;
enum
{
@ -188,87 +189,94 @@ gimp_operation_point_layer_mode_process (GeglOperation *operation,
{
switch (self->blend_mode)
{
case GIMP_NORMAL_MODE:
/* Porter-Duff A over B */
EXPAND (outC = layC + inC * (1 - layA));
break;
BLEND (GIMP_NORMAL_MODE,
outC = layC + inC * (1 - layA));
case GIMP_BEHIND_MODE:
/* Porter-Duff B over A */
EXPAND (outC = inC + layC * (1 - inA));
break;
BLEND (GIMP_BEHIND_MODE,
outC = inC + layC * (1 - inA));
case GIMP_MULTIPLY_MODE:
/* SVG 1.2 multiply */
EXPAND (outC = layC * inC + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_MULTIPLY_MODE,
outC = layC * inC + layC * (1 - inA) + inC * (1 - layA));
case GIMP_SCREEN_MODE:
/* SVG 1.2 screen */
EXPAND (outC = layC + inC - layC * inC);
break;
BLEND (GIMP_SCREEN_MODE,
outC = layC + inC - layC * inC);
case GIMP_OVERLAY_MODE:
/* SVG 1.2 overlay */
EXPAND (if (2 * inC < inA)
outC = 2 * layC * inC + layC * (1 - inA) + inC * (1 - layA);
else
outC = layA * inA - 2 * (inA - inC) * (layA - layC) + layC * (1 - inA) + inC * (1 - layA));
break;
case GIMP_DIFFERENCE_MODE:
/* SVG 1.2 difference */
EXPAND (outC = inC + layC - 2 * MIN (layC * inA, inC * layA));
break;
BLEND (GIMP_DIFFERENCE_MODE,
outC = inC + layC - 2 * MIN (layC * inA, inC * layA));
case GIMP_DARKEN_ONLY_MODE:
/* SVG 1.2 darken */
EXPAND (outC = MIN (layC * inA, inC * layA) + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_DARKEN_ONLY_MODE,
outC = MIN (layC * inA, inC * layA) + layC * (1 - inA) + inC * (1 - layA));
case GIMP_LIGHTEN_ONLY_MODE:
/* SVG 1.2 lighten */
EXPAND (outC = MAX (layC * inA, inC * layA) + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_LIGHTEN_ONLY_MODE,
outC = MAX (layC * inA, inC * layA) + layC * (1 - inA) + inC * (1 - layA));
/* SVG 1.2 overlay */
BLEND (GIMP_OVERLAY_MODE,
if (2 * inC < inA)
{
outC = 2 * layC * inC + layC * (1 - inA) + inC * (1 - layA);
}
else
{
outC = layA * inA - 2 * (inA - inC) * (layA - layC) + layC * (1 - inA) + inC * (1 - layA);
});
case GIMP_DODGE_MODE:
/* SVG 1.2 color-dodge */
EXPAND (if (layC * inA + inC * layA >= layA * inA)
outC = layA * inA + layC * (1 - inA) + inC * (1 - layA);
else
outC = inC * layA / (1 - layC / layA) + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_DODGE_MODE,
if (layC * inA + inC * layA >= layA * inA)
{
outC = layA * inA + layC * (1 - inA) + inC * (1 - layA);
}
else
{
outC = inC * layA / (1 - layC / layA) + layC * (1 - inA) + inC * (1 - layA);
});
case GIMP_BURN_MODE:
/* SVG 1.2 color-burn */
EXPAND (if (layC * inA + inC * layA <= layA * inA)
outC = layC * (1 - inA) + inC * (1 - layA);
else
outC = layA * (layC * inA + inC * layA - layA * inA) / layC + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_BURN_MODE,
if (layC * inA + inC * layA <= layA * inA)
{
outC = layC * (1 - inA) + inC * (1 - layA);
}
else
{
outC = layA * (layC * inA + inC * layA - layA * inA) / layC + layC * (1 - inA) + inC * (1 - layA);
});
case GIMP_HARDLIGHT_MODE:
/* SVG 1.2 hard-light */
EXPAND (if (2 * layC < layA)
outC = 2 * layC * inC + layC * (1 - inA) + inC * (1 - layA);
else
outC = layA * inA - 2 * (inA - inC) * (layA - layC) + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_HARDLIGHT_MODE,
if (2 * layC < layA)
{
outC = 2 * layC * inC + layC * (1 - inA) + inC * (1 - layA);
}
else
{
outC = layA * inA - 2 * (inA - inC) * (layA - layC) + layC * (1 - inA) + inC * (1 - layA);
});
case GIMP_SOFTLIGHT_MODE:
/* SVG 1.2 soft-light */
/* XXX: Why is the result so different from legacy Soft Light? */
EXPAND (if (2 * layC < layA)
outC = inC * (layA - (1 - inC/inA) * (2 * layC - layA)) + layC * (1 - inA) + inC * (1 - layA);
else if (8 * inC <= inA)
outC = inC * (layA - (1 - inC/inA) * (2 * layC - layA) * (3 - 8 * inC / inA)) + layC * (1 - inA) + inC * (1 - layA);
else
outC = (inC * layA + (sqrt (inC / inA) * inA - inC) * (2 * layC - layA)) + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_SOFTLIGHT_MODE,
if (2 * layC < layA)
{
outC = inC * (layA - (1 - inC / inA) * (2 * layC - layA)) + layC * (1 - inA) + inC * (1 - layA);
}
else if (8 * inC <= inA)
{
outC = inC * (layA - (1 - inC / inA) * (2 * layC - layA) * (3 - 8 * inC / inA)) + layC * (1 - inA) + inC * (1 - layA);
}
else
{
outC = (inC * layA + (sqrt (inC / inA) * inA - inC) * (2 * layC - layA)) + layC * (1 - inA) + inC * (1 - layA);
});
case GIMP_ADDITION_MODE:
/* To be more mathematically correct we would have to either
* adjust the formula for the resulting opacity or adapt the
* other channels to the change in opacity. Compare to the
@ -279,28 +287,24 @@ gimp_operation_point_layer_mode_process (GeglOperation *operation,
* interpreted is more important than mathematically correct
* results, we don't bother.
*/
EXPAND (outC = inC + layC);
break;
BLEND (GIMP_ADDITION_MODE,
outC = inC + layC);
case GIMP_SUBTRACT_MODE:
/* Derieved from SVG 1.2 formulas, f(Sc, Dc) = Dc - Sc */
EXPAND (outC = inC + layC - 2 * layC * inA);
break;
BLEND (GIMP_SUBTRACT_MODE,
outC = inC + layC - 2 * layC * inA);
case GIMP_GRAIN_EXTRACT_MODE:
/* Derieved from SVG 1.2 formulas, f(Sc, Dc) = Dc - Sc + 0.5 */
EXPAND (outC = inC + layC - 2 * layC * inA + 0.5 * inA * layA);
break;
BLEND (GIMP_GRAIN_EXTRACT_MODE,
outC = inC + layC - 2 * layC * inA + 0.5 * inA * layA);
case GIMP_GRAIN_MERGE_MODE:
/* Derieved from SVG 1.2 formulas, f(Sc, Dc) = Dc + Sc - 0.5 */
EXPAND (outC = inC + layC - 0.5 * inA * layA);
break;
BLEND (GIMP_GRAIN_MERGE_MODE,
outC = inC + layC - 0.5 * inA * layA);
case GIMP_DIVIDE_MODE:
/* Derieved from SVG 1.2 formulas, f(Sc, Dc) = Dc / Sc */
EXPAND (outC = inC * layA * layA / layC + layC * (1 - inA) + inC * (1 - layA));
break;
BLEND (GIMP_DIVIDE_MODE,
outC = inC * layA * layA / layC + layC * (1 - inA) + inC * (1 - layA));
case GIMP_HUE_MODE:
case GIMP_SATURATION_MODE:
@ -309,7 +313,6 @@ gimp_operation_point_layer_mode_process (GeglOperation *operation,
/* TODO */
break;
case GIMP_ERASE_MODE:
case GIMP_ANTI_ERASE_MODE:
case GIMP_COLOR_ERASE_MODE:
@ -317,7 +320,6 @@ gimp_operation_point_layer_mode_process (GeglOperation *operation,
/* Icky eraser and paint modes */
break;
case GIMP_DISSOLVE_MODE:
/* Not a point filter and cannot be implemented here */
/* g_assert_not_reached (); */