Merge branch 'maverick' into develop

Compile under OSX
2016-01-26 09:48:11 +01:00
parent f0021db2ff cdb9a8fba2
commit 5e597e2d10
46 changed files with 174 additions and 194 deletions
--- a/sansbc.c
+++ b/sansbc.c
@@ -188,7 +188,7 @@ static int StatCmd(pSICSOBJ self, SConnection *pCon, pHdb commandNode,
 		return 0;
 	}
 	max =  -9999;
-	min = 99999.99;
+	min = 99999;
 	length = dim[0]*dim[1];
 	for(i = 0, sum = 0; i < length; i++){
 		sum += data[i];