OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-06 18:26:22 +03:00
Code Packages Releases Activity

0029978: Data Exchange, macOS - the result of reading some entity from STEP looks odd

Browse Source 
On Apple with XCode 9.4.1 and onwards, the compiler optimization is disabled for method gp_Mat::Transpose() as optimizer generates invalid code when that method is used.
Some refactoring of the code affected by this bug.
This commit is contained in:
abv 2018-07-26 10:36:12 +03:00 committed by bugmaster
parent 170175554f
commit c16c60a402
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gp/gp_Mat.lxx
View File

@ -321,6 +321,14 @@ inline gp_Mat gp_Mat::Subtracted (const gp_Mat& Other) const
return NewMat; return NewMat;
} }
// On macOS 10.13.6 with XCode 9.4.1 the compiler has a bug leading to
// generation of invalid code when method gp_Mat::Transpose() is called
// for a matrix which is when applied to vector; it looks like vector
// is transformed before the matrix is actually transposed; see #29978.
// To avoid this, we disable compiler optimization here.
#if defined(__APPLE__) && (__apple_build_version__ > 9020000)
__attribute__((optnone))
#endif
inline void gp_Mat::Transpose () inline void gp_Mat::Transpose ()
{ {
Standard_Real Temp; Standard_Real Temp;

20
src/gp/gp_Trsf.cxx
View File

@ -157,11 +157,10 @@ void gp_Trsf::SetTransformation (const gp_Ax3& FromA1,
shape = gp_CompoundTrsf; shape = gp_CompoundTrsf;
scale = 1.0; scale = 1.0;
// matrix from XOY ToA2 : // matrix from XOY ToA2 :
matrix.SetCol (1, ToA2.XDirection().XYZ()); matrix.SetRows (ToA2.XDirection().XYZ(),
matrix.SetCol (2, ToA2.YDirection().XYZ()); ToA2.YDirection().XYZ(),
matrix.SetCol (3, ToA2.Direction().XYZ()); ToA2. Direction().XYZ());
loc = ToA2.Location().XYZ(); loc = ToA2.Location().XYZ();
matrix.Transpose();
loc.Multiply (matrix); loc.Multiply (matrix);
loc.Reverse (); loc.Reverse ();
@ -183,11 +182,10 @@ void gp_Trsf::SetTransformation (const gp_Ax3& A3)
{ {
shape = gp_CompoundTrsf; shape = gp_CompoundTrsf;
scale = 1.0; scale = 1.0;
loc = A3.Location().XYZ(); matrix.SetRows (A3.XDirection().XYZ(),
matrix.SetCols (A3.XDirection().XYZ(),
A3.YDirection().XYZ(), A3.YDirection().XYZ(),
A3. Direction().XYZ()); A3. Direction().XYZ());
matrix.Transpose(); loc = A3.Location().XYZ();
loc.Multiply (matrix); loc.Multiply (matrix);
loc.Reverse (); loc.Reverse ();
} }
@ -403,16 +401,12 @@ void gp_Trsf::Invert()
if (shape == gp_Identity) { } if (shape == gp_Identity) { }
else if (shape == gp_Translation || shape == gp_PntMirror) loc.Reverse(); else if (shape == gp_Translation || shape == gp_PntMirror) loc.Reverse();
else if (shape == gp_Scale) { else if (shape == gp_Scale) {
Standard_Real As = scale; Standard_ConstructionError_Raise_if (Abs(scale) <= gp::Resolution(), "gp_Trsf::Invert() - transformation has zero scale");
if (As < 0) As = - As;
Standard_ConstructionError_Raise_if (As <= gp::Resolution(), "gp_Trsf::Invert() - transformation has zero scale");
scale = 1.0 / scale; scale = 1.0 / scale;
loc.Multiply (-scale); loc.Multiply (-scale);
} }
else { else {
Standard_Real As = scale; Standard_ConstructionError_Raise_if (Abs(scale) <= gp::Resolution(), "gp_Trsf::Invert() - transformation has zero scale");
if (As < 0) As = - As;
Standard_ConstructionError_Raise_if (As <= gp::Resolution(), "gp_Trsf::Invert() - transformation has zero scale");
scale = 1.0 / scale; scale = 1.0 / scale;
matrix.Transpose (); matrix.Transpose ();
loc.Multiply (matrix); loc.Multiply (matrix);