gimp r27321 - in trunk: . app/gegl

[martinn svn gnome org]

Author: martinn
Date: Sun Oct 19 11:22:09 2008
New Revision: 27321
URL: http://svn.gnome.org/viewvc/gimp?rev=27321&view=rev

Log:
* app/gegl/gimpoperationadditionmode.c: Refer to the input as 'in'
instead of 'src', the layer as 'layer' instead of 'aux', and the
result as 'out' instead of 'dest'. The old terminology clashes
with at least the SVG 1.2 compositing terminology [1] and there is
no reason for creating confusion.

[1] http://www.w3.org/TR/2004/WD-SVG12-20041027/rendering.html


Modified:
   trunk/ChangeLog
   trunk/app/gegl/gimpoperationadditionmode.c

Modified: trunk/app/gegl/gimpoperationadditionmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationadditionmode.c	(original)
+++ trunk/app/gegl/gimpoperationadditionmode.c	Sun Oct 19 11:22:09 2008
@@ -71,37 +71,37 @@
                                       glong                samples,
                                       const GeglRectangle *roi)
 {
-  gfloat *src  = in_buf;
-  gfloat *aux  = aux_buf;
-  gfloat *dest = out_buf;
+  gfloat *in    = in_buf;
+  gfloat *layer = aux_buf;
+  gfloat *out   = out_buf;
 
   while (samples--)
     {
 #if 1
       // Best so far (maybe even correct?)
-      dest[RED]   = src[RED]   + aux[RED]   * aux[ALPHA];
-      dest[GREEN] = src[GREEN] + aux[GREEN] * aux[ALPHA];
-      dest[BLUE]  = src[BLUE]  + aux[BLUE]  * aux[ALPHA];
-      dest[ALPHA] = src[ALPHA];
+      out[RED]   = in[RED]   + layer[RED]   * layer[ALPHA];
+      out[GREEN] = in[GREEN] + layer[GREEN] * layer[ALPHA];
+      out[BLUE]  = in[BLUE]  + layer[BLUE]  * layer[ALPHA];
+      out[ALPHA] = in[ALPHA];
 #else
       // Wrong, doesn't take layer opacity of Addition-mode layer into
       // account
-      dest[RED]   = src[RED]   + aux[RED];
-      dest[GREEN] = src[GREEN] + aux[GREEN];
-      dest[BLUE]  = src[BLUE]  + aux[BLUE];
-      dest[ALPHA] = src[ALPHA];
+      out[RED]   = in[RED]   + layer[RED];
+      out[GREEN] = in[GREEN] + layer[GREEN];
+      out[BLUE]  = in[BLUE]  + layer[BLUE];
+      out[ALPHA] = in[ALPHA];
 
       // Wrong, toggling visibility of completely transparent
       // Addition-mode layer changes projection
-      dest[RED]   = src[RED]   * src[ALPHA] + aux[RED]   * aux[ALPHA];
-      dest[GREEN] = src[GREEN] * src[ALPHA] + aux[GREEN] * aux[ALPHA];
-      dest[BLUE]  = src[BLUE]  * src[ALPHA] + aux[BLUE]  * aux[ALPHA];
-      dest[ALPHA] = src[ALPHA] + aux[ALPHA] - src[ALPHA] * aux[ALPHA];
+      out[RED]   = in[RED]   * in[ALPHA] + layer[RED]   * layer[ALPHA];
+      out[GREEN] = in[GREEN] * in[ALPHA] + layer[GREEN] * layer[ALPHA];
+      out[BLUE]  = in[BLUE]  * in[ALPHA] + layer[BLUE]  * layer[ALPHA];
+      out[ALPHA] = in[ALPHA] + layer[ALPHA] - in[ALPHA] * layer[ALPHA];
 #endif
 
-      src  += 4;
-      aux  += 4;
-      dest += 4;
+      in    += 4;
+      layer += 4;
+      out   += 4;
     }
 
   return TRUE;