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

0029170: GCC 7.1 warnings -Wstrict-aliasing in Graphic3d_ArrayOfPrimitives.hxx

Browse Source 
Methods Graphic3d_ArrayOfPrimitives::SetVertexColor() accepting color as three double rgb values and Graphic3d_Vec4ub object are refactored to avoid using reinterpret_cast between pointers to complex types.

Similar correction is made in ViewerTest_ObjectCommands.cxx (static function VDrawSphere).
This commit is contained in:
abv 2017-09-30 21:35:05 +03:00 committed by bugmaster
parent c85a994a37
commit 6a657c9247
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
View File

@ -344,10 +344,11 @@ public:
if (myVCol != 0) if (myVCol != 0)
{ {
Graphic3d_Vec4ub aColor (Standard_Byte(theR * 255.0), Graphic3d_Vec4ub *aColorPtr =
Standard_Byte(theG * 255.0), reinterpret_cast<Graphic3d_Vec4ub* >(myAttribs->changeValue (theIndex - 1) + size_t(myVCol));
Standard_Byte(theB * 255.0), 255); aColorPtr->SetValues (Standard_Byte(theR * 255.0),
SetVertexColor (theIndex, *reinterpret_cast<Standard_Integer*>(&aColor)); Standard_Byte(theG * 255.0),
Standard_Byte(theB * 255.0), 255);
} }
myAttribs->NbElements = Max (theIndex, myAttribs->NbElements); myAttribs->NbElements = Max (theIndex, myAttribs->NbElements);
} }
@ -356,7 +357,23 @@ public:
void SetVertexColor (const Standard_Integer theIndex, void SetVertexColor (const Standard_Integer theIndex,
const Graphic3d_Vec4ub& theColor) const Graphic3d_Vec4ub& theColor)
{ {
SetVertexColor (theIndex, *reinterpret_cast<const Standard_Integer*> (&theColor)); if (myAttribs.IsNull())
{
return;
}
else if (theIndex < 1
|| theIndex > myMaxVertexs)
{
throw Standard_OutOfRange ("BAD VERTEX index");
}
if (myVCol != 0)
{
Graphic3d_Vec4ub *aColorPtr =
reinterpret_cast<Graphic3d_Vec4ub* >(myAttribs->changeValue (theIndex - 1) + size_t(myVCol));
(*aColorPtr) = theColor;
}
myAttribs->NbElements = Max (theIndex, myAttribs->NbElements);
} }
//! Change the vertex color of rank theIndex> in the array. //! Change the vertex color of rank theIndex> in the array.

2
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@ -2960,7 +2960,7 @@ static int VDrawSphere (Draw_Interpretor& /*di*/, Standard_Integer argc, const c
Handle(TColStd_HArray1OfInteger) aColorArray = new TColStd_HArray1OfInteger (1, aNumberPoints); Handle(TColStd_HArray1OfInteger) aColorArray = new TColStd_HArray1OfInteger (1, aNumberPoints);
for (Standard_Integer aNodeId = 1; aNodeId <= aNumberPoints; ++aNodeId) for (Standard_Integer aNodeId = 1; aNodeId <= aNumberPoints; ++aNodeId)
{ {
aColorArray->SetValue (aNodeId, *reinterpret_cast<const Standard_Integer*> (&aColor)); aColorArray->SetValue (aNodeId, *reinterpret_cast<const Standard_Integer*> (aColor.GetData()));
} }
aShape->SetColors (aColorArray); aShape->SetColors (aColorArray);