OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

Correction for Fedora 18 64 bit issue 24473

Browse Source
This commit is contained in:
bugmaster
2014-01-17 15:27:10 +04:00
parent 9278cd60ac
commit 200ed75578
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/NCollection/NCollection_Vec4.hxx
View File

@@ -287,19 +287,19 @@ public:
//! Compute component-wise minimum of two vectors.
NCollection_Vec4 cwiseMin (const NCollection_Vec4& theVec) const
{
return NCollection_Vec4 (Min (v[0], theVec.v[0]),
Min (v[1], theVec.v[1]),
Min (v[2], theVec.v[2]),
Min (v[3], theVec.v[3]));
return NCollection_Vec4 (v[0] < theVec.v[0] ? v[0] : theVec.v[0],
v[1] < theVec.v[1] ? v[1] : theVec.v[1],
v[2] < theVec.v[2] ? v[2] : theVec.v[2],
v[3] < theVec.v[3] ? v[3] : theVec.v[3]);
}
//! Compute component-wise maximum of two vectors.
NCollection_Vec4 cwiseMax (const NCollection_Vec4& theVec) const
{
return NCollection_Vec4 (Max (v[0], theVec.v[0]),
Max (v[1], theVec.v[1]),
Max (v[2], theVec.v[2]),
Max (v[3], theVec.v[3]));
return NCollection_Vec4 (v[0] > theVec.v[0] ? v[0] : theVec.v[0],
v[1] > theVec.v[1] ? v[1] : theVec.v[1],
v[2] > theVec.v[2] ? v[2] : theVec.v[2],
v[3] > theVec.v[3] ? v[3] : theVec.v[3]);
}
//! Compute per-component division by scale factor.