+ fix build error with MSVC
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5100 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
parent
2461bbd973
commit
7e1e2c1b94
|
@ -99,13 +99,13 @@ SoSeparator* ViewProvider2DObject::createGrid(void)
|
|||
}
|
||||
else {
|
||||
MiX = -exp(ceil(log(std::abs(MinX))));
|
||||
MiX = std::min(MiX,(float)-exp(ceil(log(std::abs(0.1f*MaxX)))));
|
||||
MiX = std::min<float>(MiX,(float)-exp(ceil(log(std::abs(0.1f*MaxX)))));
|
||||
MaX = exp(ceil(log(std::abs(MaxX))));
|
||||
MaX = std::max(MaX,(float)exp(ceil(log(std::abs(0.1f*MinX)))));
|
||||
MaX = std::max<float>(MaX,(float)exp(ceil(log(std::abs(0.1f*MinX)))));
|
||||
MiY = -exp(ceil(log(std::abs(MinY))));
|
||||
MiY = std::min(MiY,(float)-exp(ceil(log(std::abs(0.1f*MaxY)))));
|
||||
MiY = std::min<float>(MiY,(float)-exp(ceil(log(std::abs(0.1f*MaxY)))));
|
||||
MaY = exp(ceil(log(std::abs(MaxY))));
|
||||
MaY = std::max(MaY,(float)exp(ceil(log(std::abs(0.1f*MinY)))));
|
||||
MaY = std::max<float>(MaY,(float)exp(ceil(log(std::abs(0.1f*MinY)))));
|
||||
}
|
||||
//Round the values otherwise grid is not aligned with center
|
||||
MiX = floor(MiX / Step) * Step;
|
||||
|
|
Loading…
Reference in New Issue
Block a user