brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

matrix: Fix the init_with_matrix() implementation

Browse Source 
As usual, I swapped the memcpy() arguments around.
This commit is contained in:
Emmanuele Bassi 2012-08-16 16:13:38 +01:00
parent e9bcb4cf6e
commit f7dd2d3746
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-base-types.c
View File

@ -1376,10 +1376,8 @@ clutter_matrix_init_from_array (ClutterMatrix *matrix,
* Since: 1.12
*/
ClutterMatrix *
clutter_matrix_init_from_matrix (ClutterMatrix *a,
ClutterMatrix *b)
clutter_matrix_init_from_matrix (ClutterMatrix *a,
const ClutterMatrix *b)
{
memcpy (b, a, sizeof (ClutterMatrix));
return a;
return memcpy (a, b, sizeof (ClutterMatrix));
}

12
clutter/clutter-types.h
View File

@ -697,12 +697,12 @@ void clutter_interval_register_progress_func (GType value_type,
GType clutter_matrix_get_type (void) G_GNUC_CONST;
ClutterMatrix * clutter_matrix_alloc (void);
ClutterMatrix * clutter_matrix_init_identity (ClutterMatrix *matrix);
ClutterMatrix * clutter_matrix_init_from_array (ClutterMatrix *matrix,
const float values[16]);
ClutterMatrix * clutter_matrix_init_from_matrix (ClutterMatrix *a,
ClutterMatrix *b);
void clutter_matrix_free (ClutterMatrix *matrix);
ClutterMatrix * clutter_matrix_init_identity (ClutterMatrix *matrix);
ClutterMatrix * clutter_matrix_init_from_array (ClutterMatrix *matrix,
const float values[16]);
ClutterMatrix * clutter_matrix_init_from_matrix (ClutterMatrix *a,
const ClutterMatrix *b);
void clutter_matrix_free (ClutterMatrix *matrix);
G_END_DECLS