From: Jorge G. <cl...@us...> - 2007-12-19 15:47:33
|
Update of /cvsroot/easycalc/easycalc/mlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24783 Modified Files: display.c Log Message: improved the use of NaN & Inf Index: display.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/mlib/display.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** display.c 22 Aug 2007 19:24:03 -0000 1.12 --- display.c 19 Dec 2007 15:47:26 -0000 1.13 *************** *** 34,37 **** --- 34,38 ---- #include "fp.h" #include "stack.h" + #include "MathLib.h" TdispPrefs dispPrefs; *************** *** 61,68 **** if (number.real != 0.0 || number.imag==0.0) { fp_print_double(result,number.real); ! if (number.imag > 0.0) StrCat(result,"+"); } ! if (number.imag != 0.0) { fp_print_double(result+StrLen(result),number.imag); StrCat(result,"i"); --- 62,69 ---- if (number.real != 0.0 || number.imag==0.0) { fp_print_double(result,number.real); ! if (number.imag > 0.0 && finite(number.imag)) StrCat(result,"+"); } ! if (number.imag != 0.0 && !isnan(number.imag)) { fp_print_double(result+StrLen(result),number.imag); StrCat(result,"i"); |