From f57f2f3afc45c924448a7cea0d5a6ebb45f02796 Mon Sep 17 00:00:00 2001 From: Luc Girod Date: Sat, 5 Jul 2014 01:46:01 +0200 Subject: [PATCH] Warning fix. Thanks to Martin. --- sweet_matrix.c | 28 ++++++++++++++-------------- sweet_matrix.h | 14 +++++++------- sweet_matrix_stack.c | 14 +++++++------- sweet_matrix_stack.h | 8 ++++---- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/sweet_matrix.c b/sweet_matrix.c index 4d893c6..a39911c 100644 --- a/sweet_matrix.c +++ b/sweet_matrix.c @@ -25,7 +25,7 @@ #include "sweet_types.h" mat2 -sweet_matrix_null2 () +sweet_matrix_null2 (void) { mat2 m; @@ -39,7 +39,7 @@ sweet_matrix_null2 () } mat3 -sweet_matrix_null3 () +sweet_matrix_null3 (void) { mat3 m; @@ -59,7 +59,7 @@ sweet_matrix_null3 () } mat4 -sweet_matrix_null4 () +sweet_matrix_null4 (void) { mat4 m; @@ -88,7 +88,7 @@ sweet_matrix_null4 () mat2 -sweet_matrix_identity2 () +sweet_matrix_identity2 (void) { mat2 m; @@ -102,7 +102,7 @@ sweet_matrix_identity2 () } mat3 -sweet_matrix_identity3 () +sweet_matrix_identity3 (void) { mat3 m; @@ -122,7 +122,7 @@ sweet_matrix_identity3 () } mat4 -sweet_matrix_identity4 () +sweet_matrix_identity4 (void) { mat4 m; @@ -268,7 +268,7 @@ sweet_matrix_look_at (vec3 pos, vec3 dir, vec3 up) m.v[14] = pos.x * dir.x + pos.y * dir.y + pos.z * dir.z; m.v[15] = 1; - return m; + return m; } mat3 @@ -509,7 +509,7 @@ sweet_matrix_scale2 (float x, float y) } mat4 -sweet_matrix_texture_bias () +sweet_matrix_texture_bias (void) { mat4 m; m.v[0] = 0.5; @@ -1083,7 +1083,7 @@ static void swap_rows (mat3 * a, float * s, int l1, int l2) { float tmp; if (l1 == l2) { return; } - + /* swap left part */ tmp = s[l1]; s[l1] = s[l2]; @@ -1093,7 +1093,7 @@ static void swap_rows (mat3 * a, float * s, int l1, int l2) tmp = a->v[l1]; a->v[l1] = a->v[l2]; a->v[l2] = tmp; - + /* swap second column */ l1 += 3; l2 += 3; @@ -1126,14 +1126,14 @@ static void substract_row (mat3 * a, float * s, int l1, int l2, int i) { r = - a->v[l2]; a->v[l2] = 0; - a->v[l2+3] = a->v[l2+3] + a->v[l1+3] * r; - a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r; + a->v[l2+3] = a->v[l2+3] + a->v[l1+3] * r; + a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r; } else if (i == 1) { r = - a->v[l2+3]; a->v[l2+3] = 0; - a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r; + a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r; } else if (i == 2) { @@ -1245,7 +1245,7 @@ static void get_eigen_vector (vec3 * v, mat3 * a, float h) free_value = 1; v->z = 1; } - + if (!free_value && sweet_math_approx_equals (a->v[2], 0, EPSILON) && sweet_math_approx_equals (a->v[5], 0, EPSILON) && diff --git a/sweet_matrix.h b/sweet_matrix.h index 8f4c1be..45555c4 100644 --- a/sweet_matrix.h +++ b/sweet_matrix.h @@ -25,15 +25,15 @@ /** Null Matrix */ /** @return Null matrix */ -mat2 sweet_matrix_null2 (); -mat3 sweet_matrix_null3 (); -mat4 sweet_matrix_null4 (); +mat2 sweet_matrix_null2 (void); +mat3 sweet_matrix_null3 (void); +mat4 sweet_matrix_null4 (void); /** Identity */ /** @return Indentity matrix */ -mat2 sweet_matrix_identity2 (); -mat3 sweet_matrix_identity3 (); -mat4 sweet_matrix_identity4 (); +mat2 sweet_matrix_identity2 (void); +mat3 sweet_matrix_identity3 (void); +mat4 sweet_matrix_identity4 (void); /** Frustum */ /** @param Right as flaot */ @@ -100,7 +100,7 @@ mat2 sweet_matrix_scale2 (float x, float y); /** Texture bias */ /** @return texture bias matrix */ -mat4 sweet_matrix_texture_bias (); +mat4 sweet_matrix_texture_bias (void); /** Transpose */ /** @param Matrix to transpose as mat2 *, mat3 * or mat4 * */ diff --git a/sweet_matrix_stack.c b/sweet_matrix_stack.c index 323f367..b38ec14 100644 --- a/sweet_matrix_stack.c +++ b/sweet_matrix_stack.c @@ -20,30 +20,30 @@ #include "sweet_matrix_stack.h" matrix_stack2 -sweet_matrix_stack2_new () +sweet_matrix_stack2_new (void) { matrix_stack2 m; m.position = 0; m.matrix[0] = sweet_matrix_identity2 (); - return m; + return m; } matrix_stack3 -sweet_matrix_stack3_new () +sweet_matrix_stack3_new (void) { matrix_stack3 m; m.position = 0; m.matrix[0] = sweet_matrix_identity3 (); - return m; + return m; } matrix_stack4 -sweet_matrix_stack4_new () +sweet_matrix_stack4_new (void) { matrix_stack4 m; m.position = 0; m.matrix[0] = sweet_matrix_identity4 (); - return m; + return m; } int @@ -178,7 +178,7 @@ sweet_matrix_stack4_get_matrix_pointer (matrix_stack4 * ms) { return (ms->matrix + ms->position); } - + mat2 sweet_matrix_stack2_get_matrix (matrix_stack2 * ms) { diff --git a/sweet_matrix_stack.h b/sweet_matrix_stack.h index b4ae0c3..4fae2e7 100644 --- a/sweet_matrix_stack.h +++ b/sweet_matrix_stack.h @@ -46,11 +46,11 @@ typedef struct matrix_stack4 }matrix_stack4; -matrix_stack2 sweet_matrix_stack2_new (); +matrix_stack2 sweet_matrix_stack2_new (void); -matrix_stack3 sweet_matrix_stack3_new (); +matrix_stack3 sweet_matrix_stack3_new (void); -matrix_stack4 sweet_matrix_stack4_new (); +matrix_stack4 sweet_matrix_stack4_new (void); int sweet_matrix_stack2_push (matrix_stack2 * ms); @@ -81,7 +81,7 @@ mat2 * sweet_matrix_stack2_get_matrix_pointer (matrix_stack2 * m); mat3 * sweet_matrix_stack3_get_matrix_pointer (matrix_stack3 * m); mat4 * sweet_matrix_stack4_get_matrix_pointer (matrix_stack4 * m); - + mat2 sweet_matrix_stack2_get_matrix (matrix_stack2 * m); mat3 sweet_matrix_stack3_get_matrix (matrix_stack3 * m);