gimp r26230 - in trunk: . app/core

[neo svn gnome org]

Author: neo
Date: Thu Jul 17 20:02:02 2008
New Revision: 26230
URL: http://svn.gnome.org/viewvc/gimp?rev=26230&view=rev

Log:
2008-07-17  Sven Neumann  <sven gimp org>

	* app/core/gimpcoords.c (gimp_coords_mix): also mix in the new
	members of the GimpCoords struct.



Modified:
   trunk/ChangeLog
   trunk/app/core/gimpcoords.c

Modified: trunk/app/core/gimpcoords.c
==============================================================================
--- trunk/app/core/gimpcoords.c	(original)
+++ trunk/app/core/gimpcoords.c	Thu Jul 17 20:02:02 2008
@@ -44,21 +44,33 @@
 {
   if (b)
     {
-      ret_val->x        = amul * a->x        + bmul * b->x;
-      ret_val->y        = amul * a->y        + bmul * b->y;
-      ret_val->pressure = amul * a->pressure + bmul * b->pressure;
-      ret_val->xtilt    = amul * a->xtilt    + bmul * b->xtilt;
-      ret_val->ytilt    = amul * a->ytilt    + bmul * b->ytilt;
-      ret_val->wheel    = amul * a->wheel    + bmul * b->wheel;
+      ret_val->x          = amul * a->x          + bmul * b->x;
+      ret_val->y          = amul * a->y          + bmul * b->y;
+      ret_val->pressure   = amul * a->pressure   + bmul * b->pressure;
+      ret_val->xtilt      = amul * a->xtilt      + bmul * b->xtilt;
+      ret_val->ytilt      = amul * a->ytilt      + bmul * b->ytilt;
+      ret_val->wheel      = amul * a->wheel      + bmul * b->wheel;
+      ret_val->delta_time = amul * a->delta_time + bmul * b->delta_time;
+      ret_val->delta_x    = amul * a->delta_x    + bmul * b->delta_x;
+      ret_val->delta_y    = amul * a->delta_y    + bmul * b->delta_y;
+      ret_val->distance   = amul * a->distance   + bmul * b->distance;
+      ret_val->velocity   = amul * a->velocity   + bmul * b->velocity;
+      ret_val->random     = amul * a->random     + bmul * b->random;
     }
   else
     {
-      ret_val->x        = amul * a->x;
-      ret_val->y        = amul * a->y;
-      ret_val->pressure = amul * a->pressure;
-      ret_val->xtilt    = amul * a->xtilt;
-      ret_val->ytilt    = amul * a->ytilt;
-      ret_val->wheel    = amul * a->wheel;
+      ret_val->x          = amul * a->x;
+      ret_val->y          = amul * a->y;
+      ret_val->pressure   = amul * a->pressure;
+      ret_val->xtilt      = amul * a->xtilt;
+      ret_val->ytilt      = amul * a->ytilt;
+      ret_val->wheel      = amul * a->wheel;
+      ret_val->delta_time = amul * a->delta_time;
+      ret_val->delta_x    = amul * a->delta_x;
+      ret_val->delta_y    = amul * a->delta_y;
+      ret_val->distance   = amul * a->distance;
+      ret_val->velocity   = amul * a->velocity;
+      ret_val->random     = amul * a->random;
     }
 }
 
@@ -118,7 +130,7 @@
           a->pressure * b->pressure +
           a->xtilt    * b->xtilt    +
           a->ytilt    * b->ytilt    +
-          a->wheel    * b->wheel   );
+          a->wheel    * b->wheel);
 }