GCC complains about writing 4x4 floats into a pointer to a float.
Signed-off-by: Eric Pouech eric.pouech@gmail.com
From: Eric Pouech eric.pouech@gmail.com
GCC complains about writing 4x4 floats into a pointer to a float.
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/glu32/project.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/glu32/project.c b/dlls/glu32/project.c index dc104541b8f..0a71eabd98c 100644 --- a/dlls/glu32/project.c +++ b/dlls/glu32/project.c @@ -37,20 +37,20 @@ /* ** Make m an identity matrix */ -static void __gluMakeIdentityd(GLdouble m[16]) +static void __gluMakeIdentityd(GLdouble m[4][4]) { - m[0+4*0] = 1; m[0+4*1] = 0; m[0+4*2] = 0; m[0+4*3] = 0; - m[1+4*0] = 0; m[1+4*1] = 1; m[1+4*2] = 0; m[1+4*3] = 0; - m[2+4*0] = 0; m[2+4*1] = 0; m[2+4*2] = 1; m[2+4*3] = 0; - m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1; + m[0][0] = 1; m[0][1] = 0; m[0][2] = 0; m[0][3] = 0; + m[1][0] = 0; m[1][1] = 1; m[1][2] = 0; m[1][3] = 0; + m[2][0] = 0; m[2][1] = 0; m[2][2] = 1; m[2][3] = 0; + m[3][0] = 0; m[3][1] = 0; m[3][2] = 0; m[3][3] = 1; }
-static void __gluMakeIdentityf(GLfloat m[16]) +static void __gluMakeIdentityf(GLfloat m[4][4]) { - m[0+4*0] = 1; m[0+4*1] = 0; m[0+4*2] = 0; m[0+4*3] = 0; - m[1+4*0] = 0; m[1+4*1] = 1; m[1+4*2] = 0; m[1+4*3] = 0; - m[2+4*0] = 0; m[2+4*1] = 0; m[2+4*2] = 1; m[2+4*3] = 0; - m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1; + m[0][0] = 1; m[0][1] = 0; m[0][2] = 0; m[0][3] = 0; + m[1][0] = 0; m[1][1] = 1; m[1][2] = 0; m[1][3] = 0; + m[2][0] = 0; m[2][1] = 0; m[2][2] = 1; m[2][3] = 0; + m[3][0] = 0; m[3][1] = 0; m[3][2] = 0; m[3][3] = 1; }
/*********************************************************************** @@ -77,7 +77,7 @@ void WINAPI gluPerspective( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdo } cotangent = cos(radians) / sine;
- __gluMakeIdentityd(&m[0][0]); + __gluMakeIdentityd(m); m[0][0] = cotangent / aspect; m[1][1] = cotangent; m[2][2] = -(zFar + zNear) / deltaZ; @@ -133,7 +133,7 @@ void WINAPI gluLookAt( GLdouble eyex, GLdouble eyey, GLdouble eyez, /* Recompute up as: up = side x forward */ cross(side, forward, up);
- __gluMakeIdentityf(&m[0][0]); + __gluMakeIdentityf(m); m[0][0] = side[0]; m[1][0] = side[1]; m[2][0] = side[2];