OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NCollection/NCollection_Vec2.hxx
View File

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

12
src/NCollection/NCollection_Vec3.hxx
View File

@ -237,17 +237,17 @@ public:
//! Compute component-wise minimum of two vectors.
NCollection_Vec3 cwiseMin (const NCollection_Vec3& theVec) const
{
return NCollection_Vec3 (Min (v[0], theVec.v[0]),
Min (v[1], theVec.v[1]),
Min (v[2], theVec.v[2]));
return NCollection_Vec3 (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]);
}
//! Compute component-wise maximum of two vectors.
NCollection_Vec3 cwiseMax (const NCollection_Vec3& theVec) const
{
return NCollection_Vec3 (Max (v[0], theVec.v[0]),
Max (v[1], theVec.v[1]),
Max (v[2], theVec.v[2]));
return NCollection_Vec3 (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]);
}
//! Compute per-component division by scale factor.

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.