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

also mix in the new members of the GimpCoords struct. 

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.


svn path=/trunk/; revision=26230
This commit is contained in:
Sven Neumann 2008-07-17 20:02:02 +00:00 committed by Sven Neumann
parent 154e185df5
commit 7447eeb09c
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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.
2008-07-17 Sven Neumann <sven@gimp.org>
* app/core/gimpcoords.c (gimp_coords_mix): formatting.

38
app/core/gimpcoords.c
View File

@ -44,21 +44,33 @@ gimp_coords_mix (const gdouble amul,
{
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 @@ gimp_coords_scalarprod (const GimpCoords *a,
a->pressure * b->pressure +
a->xtilt * b->xtilt +
a->ytilt * b->ytilt +
a->wheel * b->wheel );
a->wheel * b->wheel);
}