r.random.surface: rename variable Surface to RSurface to avoid variable clash with GDAL on EPEL7 (trunk, https://trac.osgeo.org/grass/changeset/72179)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@72182 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.random.surface/calcsurf.c

@@ -93,14 +93,14 @@ void CalcSurface(void)
 	    if (ODD(Row)) {
 		for (Col = Cs - 1; Col >= 0; Col--) {
 		    G_percent(Count++, MapCount, 1);
-		    Surface[Row][Col] =
+		    RSurface[Row][Col] =
 			MakePP(Row, Col, OutRows, OutCols, Randoms, BigF);
 		}
 	    }
 	    else {
 		for (Col = 0; Col < Cs; Col++) {
 		    G_percent(Count++, MapCount, 1);
-		    Surface[Row][Col] =
+		    RSurface[Row][Col] =
 			MakePP(Row, Col, OutRows, OutCols, Randoms, BigF);
 		}
 	    }
@@ -113,10 +113,10 @@ void CalcSurface(void)
 	    if (ODD(Row)) {
 		for (Col = Cs - 1; Col >= 0; Col--) {
 		    if (CellBuffer[Col] == 0)
-			Surface[Row][Col] = 0.0;
+			RSurface[Row][Col] = 0.0;
 		    else {
 			G_percent(Count++, MapCount, 1);
-			Surface[Row][Col] =
+			RSurface[Row][Col] =
 			    MakePP(Row, Col, OutRows, OutCols, Randoms, BigF);
 		    }
 		}
@@ -124,10 +124,10 @@ void CalcSurface(void)
 	    else {
 		for (Col = 0; Col < Cs; Col++) {
 		    if (CellBuffer[Col] == 0)
-			Surface[Row][Col] = 0.0;
+			RSurface[Row][Col] = 0.0;
 		    else {
 			G_percent(Count++, MapCount, 1);
-			Surface[Row][Col] =
+			RSurface[Row][Col] =
 			    MakePP(Row, Col, OutRows, OutCols, Randoms, BigF);
 		    }
 		}

raster/r.random.surface/init.c

@@ -24,9 +24,9 @@ void Init(void)
 
     Rs = Rast_window_rows();
     Cs = Rast_window_cols();
-    Surface = (double **)G_malloc(Rs * sizeof(double *));
+    RSurface = (double **)G_malloc(Rs * sizeof(double *));
     for (row = 0; row < Rs; row++)
-	Surface[row] = (double *)G_malloc(Cs * sizeof(double));
+	RSurface[row] = (double *)G_malloc(Cs * sizeof(double));
 
     G_get_set_window(&Region);
     EW = Region.ew_res;

raster/r.random.surface/main.c

@@ -31,7 +31,7 @@
 #include "local_proto.h"
 
 BIGF BigF;
-double **Surface, NS, EW, FilterSD, AllMaxDist, *Norm;
+double **RSurface, NS, EW, FilterSD, AllMaxDist, *Norm;
 int MapCount, FDM, Rs, Cs, Theory;
 CELL *CellBuffer;
 FILTER *AllFilters, Filter;

raster/r.random.surface/ransurf.h

@@ -38,7 +38,7 @@ CATINFO {
 };
 
 extern BIGF BigF;
-extern double **Surface, NS, EW, FilterSD, AllMaxDist, *Norm;
+extern double **RSurface, NS, EW, FilterSD, AllMaxDist, *Norm;
 extern int MapCount, FDM, Rs, Cs, Theory;
 extern CELL *CellBuffer;
 extern FILTER *AllFilters, Filter;

raster/r.random.surface/save.c

@@ -26,7 +26,7 @@ void SaveMap(int NumMap, int MapSeed)
     if (FDM == -1) {
 	for (Row = 0; Row < Rs; Row++) {
 	    for (Col = 0; Col < Cs; Col++) {
-		Value = Surface[Row][Col];
+		Value = RSurface[Row][Col];
 		MeanMod += Value;
 	    }
 	}
@@ -37,13 +37,13 @@ void SaveMap(int NumMap, int MapSeed)
 	DownInterval = UpInterval = Value;
 	for (Row = 0; Row < Rs; Row++) {
 	    for (Col = 0; Col < Cs; Col++) {
-		Value = Surface[Row][Col];
+		Value = RSurface[Row][Col];
 		/*
 		   Value = (Value - MeanMod) / FilterSD
 		   + MeanMod / FilterSD;
 		 */
 		Value /= FilterSD;
-		Surface[Row][Col] = Value;
+		RSurface[Row][Col] = Value;
 
 		if (UpInterval < Value)
 		    UpInterval = Value;
@@ -58,7 +58,7 @@ void SaveMap(int NumMap, int MapSeed)
 	    Rast_get_c_row_nomask(FDM, CellBuffer, Row);
 	    for (Col = 0; Col < Cs; Col++) {
 		if (CellBuffer[Col] != 0) {
-		    Value = Surface[Row][Col];
+		    Value = RSurface[Row][Col];
 		    MeanMod += Value;
 		}
 	    }
@@ -77,13 +77,13 @@ void SaveMap(int NumMap, int MapSeed)
 	    Rast_get_c_row_nomask(FDM, CellBuffer, Row);
 	    for (Col = 0; Col < Cs; Col++) {
 		if (CellBuffer[Col] != 0) {
-		    Value = Surface[Row][Col];
+		    Value = RSurface[Row][Col];
 		    /*
 		       Value = (Value - MeanMod) / FilterSD
 		       + MeanMod / FilterSD;
 		     */
 		    Value /= FilterSD;
-		    Surface[Row][Col] = Value;
+		    RSurface[Row][Col] = Value;
 
 		    if (UpInterval < Value)
 			UpInterval = Value;
@@ -111,7 +111,7 @@ void SaveMap(int NumMap, int MapSeed)
 	/* normal distribution */
 	for (Row = 0; Row < Rs; Row++) {
 	    for (Col = 0; Col < Cs; Col++) {
-		Value = Surface[Row][Col];
+		Value = RSurface[Row][Col];
 		if (Value > UpInterval) {
 		    Value = UpInterval;
 		}
@@ -132,7 +132,7 @@ void SaveMap(int NumMap, int MapSeed)
 		if (Value < CatInfo.Min[Index])
 		    CatInfo.Min[Index] = Value;
 
-		Surface[Row][Col] = 1 + Index;
+		RSurface[Row][Col] = 1 + Index;
 	    }
 	}
     }
@@ -140,7 +140,7 @@ void SaveMap(int NumMap, int MapSeed)
 	/* mapping to cumulative normal distribution function */
 	for (Row = 0; Row < Rs; Row++) {
 	    for (Col = 0; Col < Cs; Col++) {
-		Value = Surface[Row][Col];
+		Value = RSurface[Row][Col];
 		Ratio = (double)(Value - MIN_INTERVAL) /
 		    (MAX_INTERVAL - MIN_INTERVAL);
 		Index = (int)(Ratio * (SIZE_OF_DISTRIBUTION - 1));
@@ -157,7 +157,7 @@ void SaveMap(int NumMap, int MapSeed)
 		    CatInfo.Min[NormIndex] = Value;
 
 		/* NormIndex in range of [0 .. (CatInfo.NumCat-1)] */
-		Surface[Row][Col] = 1 + NormIndex;
+		RSurface[Row][Col] = 1 + NormIndex;
 	    }
 	}
     }
@@ -165,7 +165,7 @@ void SaveMap(int NumMap, int MapSeed)
     for (Row = 0; Row < Rs; Row++) {
 	G_percent(Row, Rs, 2);
 	for (Col = 0; Col < Cs; Col++) {
-	    CellBuffer[Col] = (CELL) Surface[Row][Col];
+	    CellBuffer[Col] = (CELL) RSurface[Row][Col];
 	}
 	Rast_put_row(OutFD, CellBuffer, CELL_TYPE);
     }

raster/r.random.surface/zero.c

@@ -14,6 +14,6 @@ void ZeroMapCells(void)
 
     for (Row = 0; Row < Rs; Row++) {
 	for (Col = 0; Col < Cs; Col++)
-	    Surface[Row][Col] = 0.0;
+	    RSurface[Row][Col] = 0.0;
     }
 }