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

0023072: Eliminate compiler warnings (level 3) on Windows / MSVC++

Browse Source
This commit is contained in:
dbv
2012-06-25 11:31:40 +04:00
parent 9d091ec153
commit 60be1f9b1d
47 changed files with 126 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
View File

@@ -203,8 +203,8 @@ is
-- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
SetPolygonOffsets ( me : mutable;
aMode : Integer from Standard;
aFactor : Real from Standard = 1.0;
aUnits : Real from Standard = 0.0 );
aFactor : ShortReal from Standard = 1.0;
aUnits : ShortReal from Standard = 0.0 );
---Level: Public
---Purpose: Sets up OpenGL polygon offsets mechanism.
-- <aMode> parameter can contain various combinations of
@@ -291,8 +291,8 @@ is
-- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
PolygonOffsets ( me;
aMode : out Integer from Standard;
aFactor : out Real from Standard;
aUnits : out Real from Standard );
aFactor : out ShortReal from Standard;
aUnits : out ShortReal from Standard );
---Level: Public
---Purpose: Returns current polygon offsets settings.
---Category: Inquire methods
@@ -342,7 +342,7 @@ fields
-- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
-- polygon offsets
MyPolygonOffsetMode : Integer from Standard;
MyPolygonOffsetFactor : Real from Standard;
MyPolygonOffsetUnits : Real from Standard;
MyPolygonOffsetFactor : ShortReal from Standard;
MyPolygonOffsetUnits : ShortReal from Standard;
end AspectFillArea3d;

12
src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
View File

@@ -247,17 +247,17 @@ Aspect_TypeOfDegenerateModel Graphic3d_AspectFillArea3d::DegenerateModel(
}
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
void Graphic3d_AspectFillArea3d::SetPolygonOffsets(const Standard_Integer aMode,
const Standard_Real aFactor,
const Standard_Real aUnits) {
void Graphic3d_AspectFillArea3d::SetPolygonOffsets(const Standard_Integer aMode,
const Standard_ShortReal aFactor,
const Standard_ShortReal aUnits) {
MyPolygonOffsetMode = ( aMode & Aspect_POM_Mask );
MyPolygonOffsetFactor = aFactor;
MyPolygonOffsetUnits = aUnits;
}
void Graphic3d_AspectFillArea3d::PolygonOffsets(Standard_Integer& aMode,
Standard_Real& aFactor,
Standard_Real& aUnits) const {
void Graphic3d_AspectFillArea3d::PolygonOffsets(Standard_Integer& aMode,
Standard_ShortReal& aFactor,
Standard_ShortReal& aUnits) const {
aMode = MyPolygonOffsetMode;
aFactor = MyPolygonOffsetFactor;
aUnits = MyPolygonOffsetUnits;

8
src/Graphic3d/Graphic3d_Group_8.cxx
View File

@@ -278,7 +278,7 @@ void Graphic3d_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectFil
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
Standard_Integer aPolyMode;
Standard_Real aPolyFactor, aPolyUnits;
Standard_ShortReal aPolyFactor, aPolyUnits;
CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
MyCGroup.ContextFillArea.PolygonOffsetMode = aPolyMode;
MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
@@ -362,7 +362,7 @@ void Graphic3d_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectTex
MyCGroup.ContextText.ColorSubTitle.g = float (Gs);
MyCGroup.ContextText.ColorSubTitle.b = float (Bs);
MyCGroup.ContextText.TextZoomable = ATextZoomable;
MyCGroup.ContextText.TextAngle = ATextAngle;
MyCGroup.ContextText.TextAngle = float (ATextAngle);
MyCGroup.ContextText.TextFontAspect = (int)ATextFontAspect;
MyCGroup.ContextText.IsDef = 1;
@@ -598,7 +598,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectFillArea
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
Standard_Integer aPolyMode;
Standard_Real aPolyFactor, aPolyUnits;
Standard_ShortReal aPolyFactor, aPolyUnits;
CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
MyCGroup.ContextFillArea.PolygonOffsetMode = aPolyMode;
MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
@@ -682,7 +682,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectText3d)&
MyCGroup.ContextText.ColorSubTitle.g = float (Gs);
MyCGroup.ContextText.ColorSubTitle.b = float (Bs);
MyCGroup.ContextText.TextZoomable = ATextZoomable;
MyCGroup.ContextText.TextAngle = ATextAngle;
MyCGroup.ContextText.TextAngle = float (ATextAngle);
MyCGroup.ContextText.TextFontAspect = (int)ATextFontAspect;
MyCGroup.ContextText.IsDef = 1;

14
src/Graphic3d/Graphic3d_Structure.cxx
View File

@@ -1262,7 +1262,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectFill
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
Standard_Integer aPolyMode;
Standard_Real aPolyFactor, aPolyUnits;
Standard_ShortReal aPolyFactor, aPolyUnits;
CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
MyCStructure.ContextFillArea.PolygonOffsetMode = aPolyMode;
MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
@@ -1319,7 +1319,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectText
MyCStructure.ContextText.ColorSubTitle.g = float (Gs);
MyCStructure.ContextText.ColorSubTitle.b = float (Bs);
MyCStructure.ContextText.TextZoomable = ATextZoomable;
MyCStructure.ContextText.TextAngle = ATextAngle;
MyCStructure.ContextText.TextAngle = float (ATextAngle);
MyCStructure.ContextText.TextFontAspect = (int)ATextFontAspect;
MyCStructure.ContextText.IsDef = 1;
@@ -1783,9 +1783,9 @@ void Graphic3d_Structure::SetTransformPersistence( const Graphic3d_TransModeFlag
if (IsDeleted ()) return;
MyCStructure.TransformPersistence.Flag = AFlag;
MyCStructure.TransformPersistence.Point.x = APoint.X();
MyCStructure.TransformPersistence.Point.y = APoint.Y();
MyCStructure.TransformPersistence.Point.z = APoint.Z();
MyCStructure.TransformPersistence.Point.x = float (APoint.X());
MyCStructure.TransformPersistence.Point.y = float (APoint.Y());
MyCStructure.TransformPersistence.Point.z = float (APoint.Z());
//MyStructureManager->Update ();
//Update();
MyGraphicDriver->ContextStructure( MyCStructure );
@@ -2157,7 +2157,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
MyCStructure.ContextText.ColorSubTitle.g = float (Gs);
MyCStructure.ContextText.ColorSubTitle.b = float (Bs);
MyCStructure.ContextText.TextZoomable = ATextZoomable;
MyCStructure.ContextText.TextAngle = ATextAngle;
MyCStructure.ContextText.TextAngle = float (ATextAngle);
MyCStructure.ContextText.TextFontAspect = (int)ATextFontAspect;
@@ -2339,7 +2339,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
Standard_Integer aPolyMode;
Standard_Real aPolyFactor, aPolyUnits;
Standard_ShortReal aPolyFactor, aPolyUnits;
CTXF->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
MyCStructure.ContextFillArea.PolygonOffsetMode = aPolyMode;
MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;