diff --git a/src/meshlabplugins/meshdecorate/meshdecorate.cpp b/src/meshlabplugins/meshdecorate/meshdecorate.cpp index 9f3c512a7..3733febe3 100644 --- a/src/meshlabplugins/meshdecorate/meshdecorate.cpp +++ b/src/meshlabplugins/meshdecorate/meshdecorate.cpp @@ -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;irenderText(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());