From 0210cc40f9feaea035312424af060d8caa8c5d8a Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 17 May 2012 19:16:14 +0100 Subject: [PATCH] Make cogl_matrix_init_from_quaternion take a const quaternion The quaternion is not modified so for consistency with the rest of the API it should probably be const. Reviewed-by: Robert Bragg (cherry picked from commit 7fa8c05c2ffb90cba03289a04e37866efc0890a5) --- cogl/cogl-matrix.c | 4 ++-- cogl/cogl-matrix.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cogl/cogl-matrix.c b/cogl/cogl-matrix.c index 51665496c..512327f92 100644 --- a/cogl/cogl-matrix.c +++ b/cogl/cogl-matrix.c @@ -1711,7 +1711,7 @@ _cogl_matrix_init_from_matrix_without_inverse (CoglMatrix *matrix, static void _cogl_matrix_init_from_quaternion (CoglMatrix *matrix, - CoglQuaternion *quaternion) + const CoglQuaternion *quaternion) { float qnorm = _COGL_QUATERNION_NORM (quaternion); float s = (qnorm > 0.0f) ? (2.0f / qnorm) : 0.0f; @@ -1746,7 +1746,7 @@ _cogl_matrix_init_from_quaternion (CoglMatrix *matrix, void cogl_matrix_init_from_quaternion (CoglMatrix *matrix, - CoglQuaternion *quaternion) + const CoglQuaternion *quaternion) { _cogl_matrix_init_from_quaternion (matrix, quaternion); } diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h index 3f0709a73..4a237c2b0 100644 --- a/cogl/cogl-matrix.h +++ b/cogl/cogl-matrix.h @@ -487,12 +487,10 @@ cogl_matrix_get_array (const CoglMatrix *matrix); * @quaternion: A #CoglQuaternion * * Initializes @matrix from a #CoglQuaternion rotation. - * - * Return value: a pointer to the float array */ void cogl_matrix_init_from_quaternion (CoglMatrix *matrix, - CoglQuaternion *quaternion); + const CoglQuaternion *quaternion); #endif /**