Merge pull request #499 from tooold2rock-n-roll/tooold2rock-n-roll/issue_n498_int2float_conversion_warnings

Fixing warning messages.

test/src/test_mat2.h

@@ -199,7 +199,7 @@ TEST_IMPL(GLM_PREFIX, mat2_scale) {
   int i, j;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat2_scale)(m1, scale);
 

test/src/test_mat2x3.h

@@ -143,7 +143,7 @@ TEST_IMPL(GLM_PREFIX, mat2x3_scale) {
   int i, j;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat2x3_scale)(m1, scale);
 

test/src/test_mat2x4.h

@@ -146,7 +146,7 @@ TEST_IMPL(GLM_PREFIX, mat2x4_scale) {
   int i, j;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat2x4_scale)(m1, scale);
 

test/src/test_mat3.h

@@ -187,7 +187,7 @@ TEST_IMPL(GLM_PREFIX, mat3_scale) {
   int i, j, k;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat3_scale)(m1, scale);
 

test/src/test_mat3x2.h

@@ -142,7 +142,7 @@ TEST_IMPL(GLM_PREFIX, mat3x2_scale) {
   int i, j;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat3x2_scale)(m1, scale);
 

test/src/test_mat3x4.h

@@ -148,7 +148,7 @@ TEST_IMPL(GLM_PREFIX, mat3x4_scale) {
   int i, j;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat3x4_scale)(m1, scale);
 

test/src/test_mat4.h

@@ -295,7 +295,7 @@ TEST_IMPL(GLM_PREFIX, mat4_scale_p) {
   int i, j, k;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat4_scale_p)(m1, scale);
 
@@ -315,7 +315,7 @@ TEST_IMPL(GLM_PREFIX, mat4_scale) {
   int i, j, k;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat4_scale)(m1, scale);
 

test/src/test_mat4x2.h

@@ -98,7 +98,7 @@ TEST_IMPL(GLM_PREFIX, mat4x2_mul) {
   for (r = 0; r < 2; r++) {
     for (c = 0; c < 2; c++) {
       for (k = 0; k < 4; k++) {
-	m4[c][r] += m1[k][r] * m2[c][k];
+        m4[c][r] += m1[k][r] * m2[c][k];
       }
     }
   }
@@ -145,7 +145,7 @@ TEST_IMPL(GLM_PREFIX, mat4x2_scale) {
   int i, j;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat4x2_scale)(m1, scale);
 

test/src/test_mat4x3.h

@@ -149,7 +149,7 @@ TEST_IMPL(GLM_PREFIX, mat4x3_scale) {
   int i, j;
   float scale;
 
-  scale = rand() % 100;
+  scale = (float)(rand() % 100);
 
   GLM(mat4x3_scale)(m1, scale);