Merged changes from 3.14 branch

Fixed issues building on Solaris. Up to revno 12497.
2014-09-25 16:34:12 -05:00
parent d73b4eb470 e1eac6657d
commit 8fde7fb4f3
28 changed files with 159 additions and 96 deletions
@@ -444,7 +444,7 @@ static void convert(aiRecord *prec)
 	}

 	/* apply smoothing algorithm */
-	if (prec->smoo != 0.0){
+    if (prec->smoo != 0.0 && finite(prec->val)){
 	    if (prec->init) prec->val = val;	/* initial condition */
 	    prec->val = val * (1.00 - prec->smoo) + (prec->val * prec->smoo);
 	}else{