disambiguated max float/double

This commit is contained in:
Paolo Cignoni cignoni 2006-03-29 10:06:14 +00:00
parent 12d3a2a05c
commit 01fd77a995

View File

@ -23,6 +23,9 @@
/****************************************************************************
History
$Log$
Revision 1.31 2006/03/29 10:06:14 cignoni
disambiguated max float/double
Revision 1.30 2006/03/29 07:30:21 zifnab1974
max of float and double is not possible, remove f for gcc 3.4.5
@ -374,7 +377,7 @@ void ExtraMeshDecoratePlugin::drawQuotedLine(const Point3d &a,const Point3d &b,
glVertex(Zero+v*i);
glEnd();
int neededZeros=ceil(max(0.0,-log10(tickDist)));
int neededZeros=ceil(max(0.0f,-log10(tickDist)));
for(i=firstTick;i<bVal;i+=tickDist)
gla->renderText(Zero[0]+i*v[0],Zero[1]+i*v[1],Zero[2]+i*v[2],tr("%1").arg(i,3+neededZeros,'f',neededZeros),gla->getFont());