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

0029165: Visualization - misuse of enumeration in Prs3d_DatumAspect

Browse Source 
Methods SetDrawFirstAndSecondAxis() and SetDrawThirdAxis() of the class Prs3d_DatumAspect are corrected to ensure that myAxis may be set only to valid values of the enum, and avoid unsafe operations.
This commit is contained in:
abv 2017-09-29 19:04:13 +03:00 committed by bugmaster
parent 9b372aa8ba
commit 03d960b8de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Prs3d/Prs3d_DatumAspect.cxx
View File

@ -85,11 +85,11 @@ void Prs3d_DatumAspect::SetDrawFirstAndSecondAxis (Standard_Boolean theToDraw)
{ {
if (theToDraw) if (theToDraw)
{ {
myAxes = Prs3d_DatumAxes(myAxes | Prs3d_DA_XAxis | Prs3d_DA_YAxis); myAxes = ((myAxes & Prs3d_DA_ZAxis) != 0 ? Prs3d_DA_XYZAxis : Prs3d_DA_XYAxis);
} }
else else
{ {
myAxes = Prs3d_DatumAxes(myAxes & !Prs3d_DA_XAxis & !Prs3d_DA_YAxis); myAxes = Prs3d_DA_ZAxis;
} }
} }
@ -101,11 +101,11 @@ void Prs3d_DatumAspect::SetDrawThirdAxis (Standard_Boolean theToDraw)
{ {
if (theToDraw) if (theToDraw)
{ {
myAxes = Prs3d_DatumAxes(myAxes | Prs3d_DA_ZAxis); myAxes = ((myAxes & Prs3d_DA_XYAxis) != 0 ? Prs3d_DA_XYZAxis : Prs3d_DA_ZAxis);
} }
else else
{ {
myAxes = Prs3d_DatumAxes(myAxes & !Prs3d_DA_ZAxis); myAxes = Prs3d_DA_XYAxis;
} }
} }