Mercurial > hg > svgui

diff layer/LogNumericalScale.cpp @ 905:b66fb15de477 cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Working through the float/double and int/sv_frame_t fixes
author Chris Cannam
date Mon, 09 Mar 2015 14:35:21 +0000
parents e0f08e108064
children 4fe7a09be0fe
line wrap: on
line diff
--- a/layer/LogNumericalScale.cpp	Mon Mar 09 12:02:10 2015 +0000
+++ b/layer/LogNumericalScale.cpp	Mon Mar 09 14:35:21 2015 +0000
@@ -62,9 +62,9 @@
     int dp = 0;
 
     if (minDispInc > 0) {
-        int prec = trunc(log10f(minDispInc));
+        int prec = int(trunc(log10(minDispInc)));
         if (prec < 0) dp = -prec;
-        round = powf(10.f, prec);
+        round = pow(10.0, prec);
         if (dp > 4) dp = 4;
 #ifdef DEBUG_TIME_VALUE_LAYER
         cerr << "round = " << round << ", prec = " << prec << ", dp = " << dp << endl;
@@ -99,7 +99,7 @@
 	    continue;
         }
 
-	int digits = trunc(log10f(dispval));
+	int digits = int(trunc(log10(dispval)));
 	int sf = dp + (digits > 0 ? digits : 0);
 	if (sf < 4) sf = 4;
 #ifdef DEBUG_TIME_VALUE_LAYER