فهرست منبع

size_t: update gmath lib

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52045 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 13 سال پیش
والد
کامیت
8265a991b4
2فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 2 2
      lib/gmath/dalloc.c
  2. 1 1
      lib/gmath/ialloc.c

+ 2 - 2
lib/gmath/dalloc.c

@@ -63,7 +63,7 @@ double **G_alloc_matrix(int rows, int cols)
     int i;
 
     m = (double **)G_calloc(rows, sizeof(double *));
-    m[0] = (double *)G_calloc(rows * cols, sizeof(double));
+    m[0] = (double *)G_calloc((size_t) rows * cols, sizeof(double));
     for (i = 1; i < rows; i++)
 	m[i] = m[i - 1] + cols;
 
@@ -107,7 +107,7 @@ float **G_alloc_fmatrix(int rows, int cols)
     int i;
 
     m = (float **)G_calloc(rows, sizeof(float *));
-    m[0] = (float *)G_calloc(rows * cols, sizeof(float));
+    m[0] = (float *)G_calloc((size_t) rows * cols, sizeof(float));
     for (i = 1; i < rows; i++)
 	m[i] = m[i - 1] + cols;
 

+ 1 - 1
lib/gmath/ialloc.c

@@ -61,7 +61,7 @@ int **G_alloc_imatrix(int rows, int cols)
     int i;
 
     m = (int **)G_calloc(rows, sizeof(int *));
-    m[0] = (int *)G_calloc(rows * cols, sizeof(int));
+    m[0] = (int *)G_calloc((size_t) rows * cols, sizeof(int));
     for (i = 1; i < rows; i++)
 	m[i] = m[i - 1] + cols;