fixed min/max problem

This commit is contained in:
Andreas Fabri 2006-08-16 21:29:43 +00:00
parent a427ceec6a
commit 0b94820931
1 changed files with 6 additions and 6 deletions

View File

@ -85,12 +85,12 @@ inline
Bbox_3
Bbox_3::operator+(const Bbox_3& b) const
{
return Bbox_3(std::min(xmin(), b.xmin()),
std::min(ymin(), b.ymin()),
std::min(zmin(), b.zmin()),
std::max(xmax(), b.xmax()),
std::max(ymax(), b.ymax()),
std::max(zmax(), b.zmax()));
return Bbox_3((std::min)(xmin(), b.xmin()),
(std::min)(ymin(), b.ymin()),
(std::min)(zmin(), b.zmin()),
(std::max)(xmax(), b.xmax()),
(std::max)(ymax(), b.ymax()),
(std::max)(zmax(), b.zmax()));
}
inline