epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Convert NaN values properly.

Browse Source
This commit is contained in:
Andrew Johnson
2008-08-11 21:55:02 +00:00
parent 9842182954
commit 7ab50cad05
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/cvtFast/cvtFast.c
+3 -2
View File
@@ -30,6 +30,7 @@
#define epicsExportSharedSymbols
#include "cvtFast.h"
#include "epicsMath.h"
/*
* This routine converts numbers less than 10,000,000. It defers to f_to_str for
@@ -49,7 +50,7 @@ int epicsShareAPI cvtFloatToString(
char *startAddr;
/* can this routine handle this conversion */
if (precision > 8 || flt_value > 10000000.0 || flt_value < -10000000.0) {
if (isnan(flt_value) || precision > 8 || flt_value > 10000000.0 || flt_value < -10000000.0) {
sprintf(pstr_value,"%12.5e",(double)flt_value);
return((int)strlen(pstr_value));
}
@@ -123,7 +124,7 @@ int epicsShareAPI cvtDoubleToString(
char *startAddr;
/* can this routine handle this conversion */
if (precision > 8 || flt_value > 10000000.0 || flt_value < -10000000.0) {
if (isnan(flt_value) || precision > 8 || flt_value > 10000000.0 || flt_value < -10000000.0) {
if (precision > 8 || flt_value > 1e16 || flt_value < -1e16) {
if(precision>17) precision=17;
sprintf(pstr_value,"%*.*e",precision+7,precision,