Use .get() method instead of operator->() where result can be NULL.
STEPCAFControl_Reader::ReadLayers(), XCAFDoc_ColorTool,
XCAFDoc_LayerTool::SetVisibility() - fixed static functions syntax.
//AGV 22.03.12: Comparison should be based on names rather than Handles
const Expr_NamedExpression* pOther =
- static_cast<const Expr_NamedExpression*>(theOther.operator->());
+ static_cast<const Expr_NamedExpression*>(theOther.get());
if (pOther == this || pOther->GetName().IsEqual(myName))
aResult = Standard_True;
}
const Handle(MAT_Arc)& anArc)
{
if (aSide == MAT_Left)
- firstArcLeft = anArc.operator->();
+ firstArcLeft = anArc.get();
else
- firstArcRight = anArc.operator->();
+ firstArcRight = anArc.get();
}
//========================================================================
const Handle(MAT_Arc)& anArc)
{
if (aSide == MAT_Left)
- secondArcLeft = anArc.operator->();
+ secondArcLeft = anArc.get();
else
- secondArcRight = anArc.operator->();
+ secondArcRight = anArc.get();
}
//========================================================================
{
if (aSide == MAT_Left) {
if (aNode == FirstNode())
- firstArcLeft = anArc.operator->();
+ firstArcLeft = anArc.get();
else if (aNode == SecondNode())
- secondArcLeft = anArc.operator->();
+ secondArcLeft = anArc.get();
else
throw Standard_DomainError("MAT_Arc::SetNeighbour");
}
else {
if (aNode == FirstNode())
- firstArcRight = anArc.operator->();
+ firstArcRight = anArc.get();
else if (aNode == SecondNode())
- secondArcRight = anArc.operator->();
+ secondArcRight = anArc.get();
else
throw Standard_DomainError("MAT_Arc::SetNeighbour");
}
//========================================================================
void MAT_BasicElt::SetStartArc(const Handle(MAT_Arc)& anArc)
{
- startLeftArc = anArc.operator->();
+ startLeftArc = anArc.get();
}
//========================================================================
void MAT_BasicElt::SetEndArc(const Handle(MAT_Arc)& anArc)
{
- endLeftArc = anArc.operator->();
+ endLeftArc = anArc.get();
}
//========================================================================
: geomIndex(GeomIndex),
distance(Distance)
{
- aLinkedArc = LinkedArc.operator->();
+ aLinkedArc = LinkedArc.get();
}
//=============================================================================
//=============================================================================
void MAT_Node::SetLinkedArc (const Handle(MAT_Arc)& LinkedArc)
{
- aLinkedArc = LinkedArc.operator->();
+ aLinkedArc = LinkedArc.get();
}
//=============================================================================
while (myFirst != NULL)
{
OpenGl_ElementNode* aNext = myFirst->next;
- OpenGl_Element::Destroy (theGlCtx.operator->(), myFirst->elem);
+ OpenGl_Element::Destroy (theGlCtx.get(), myFirst->elem);
delete myFirst;
myFirst = aNext;
}
myLast = NULL;
- OpenGl_Element::Destroy (theGlCtx.operator->(), myAspects);
+ OpenGl_Element::Destroy (theGlCtx.get(), myAspects);
}
const Handle(Graphic3d_BoundBuffer)& theBounds)
{
// Release old graphic resources
- Release (theContext.operator->());
+ Release (theContext.get());
myIndices = theIndices;
myAttribs = theAttribs;
// =======================================================================
void OpenGl_View::ReleaseGlResources (const Handle(OpenGl_Context)& theCtx)
{
- myGraduatedTrihedron.Release (theCtx.operator->());
- myFrameStatsPrs.Release (theCtx.operator->());
+ myGraduatedTrihedron.Release (theCtx.get());
+ myFrameStatsPrs.Release (theCtx.get());
if (!myTextureEnv.IsNull())
{
- for (OpenGl_TextureSet::Iterator aTextureIter (myTextureEnv); aTextureIter.More(); aTextureIter.Next())
+ if (!theCtx.IsNull())
{
- theCtx->DelayedRelease (aTextureIter.ChangeValue());
- aTextureIter.ChangeValue().Nullify();
+ for (OpenGl_TextureSet::Iterator aTextureIter (myTextureEnv); aTextureIter.More(); aTextureIter.Next())
+ {
+ theCtx->DelayedRelease (aTextureIter.ChangeValue());
+ aTextureIter.ChangeValue().Nullify();
+ }
}
myTextureEnv.Nullify();
}
if (myTextureParams != NULL)
{
- myTextureParams->Release (theCtx.operator->());
+ myTextureParams->Release (theCtx.get());
}
if (myBgGradientArray != NULL)
{
- myBgGradientArray->Release (theCtx.operator->());
+ myBgGradientArray->Release (theCtx.get());
}
if (myBgTextureArray != NULL)
{
- myBgTextureArray->Release (theCtx.operator->());
- }
-
- myMainSceneFbos[0] ->Release (theCtx.operator->());
- myMainSceneFbos[1] ->Release (theCtx.operator->());
- myMainSceneFbosOit[0] ->Release (theCtx.operator->());
- myMainSceneFbosOit[1] ->Release (theCtx.operator->());
- myImmediateSceneFbos[0] ->Release (theCtx.operator->());
- myImmediateSceneFbos[1] ->Release (theCtx.operator->());
- myImmediateSceneFbosOit[0]->Release (theCtx.operator->());
- myImmediateSceneFbosOit[1]->Release (theCtx.operator->());
- myOpenGlFBO ->Release (theCtx.operator->());
- myOpenGlFBO2 ->Release (theCtx.operator->());
- myFullScreenQuad .Release (theCtx.operator->());
- myFullScreenQuadFlip .Release (theCtx.operator->());
+ myBgTextureArray->Release (theCtx.get());
+ }
+
+ myMainSceneFbos[0] ->Release (theCtx.get());
+ myMainSceneFbos[1] ->Release (theCtx.get());
+ myMainSceneFbosOit[0] ->Release (theCtx.get());
+ myMainSceneFbosOit[1] ->Release (theCtx.get());
+ myImmediateSceneFbos[0] ->Release (theCtx.get());
+ myImmediateSceneFbos[1] ->Release (theCtx.get());
+ myImmediateSceneFbosOit[0]->Release (theCtx.get());
+ myImmediateSceneFbosOit[1]->Release (theCtx.get());
+ myOpenGlFBO ->Release (theCtx.get());
+ myOpenGlFBO2 ->Release (theCtx.get());
+ myFullScreenQuad .Release (theCtx.get());
+ myFullScreenQuadFlip .Release (theCtx.get());
releaseRaytraceResources (theCtx);
}
{
if (!theResource.IsNull())
{
- theResource->Release (theGlContext.operator->());
+ theResource->Release (theGlContext.get());
theResource.Nullify();
}
}
if (!theToRebuild) // complete release
{
- myRaytraceFBO1[0]->Release (theGlContext.operator->());
- myRaytraceFBO1[1]->Release (theGlContext.operator->());
- myRaytraceFBO2[0]->Release (theGlContext.operator->());
- myRaytraceFBO2[1]->Release (theGlContext.operator->());
+ myRaytraceFBO1[0]->Release (theGlContext.get());
+ myRaytraceFBO1[1]->Release (theGlContext.get());
+ myRaytraceFBO2[0]->Release (theGlContext.get());
+ myRaytraceFBO2[1]->Release (theGlContext.get());
nullifyResource (theGlContext, myRaytraceOutputTexture[0]);
nullifyResource (theGlContext, myRaytraceOutputTexture[1]);
if (myRaytraceScreenQuad.IsValid ())
{
- myRaytraceScreenQuad.Release (theGlContext.operator->());
+ myRaytraceScreenQuad.Release (theGlContext.get());
}
}
}
// fetch OpenGl context state
aCtx->FetchState();
- OpenGl_FrameBuffer* aFrameBuffer = myFBO.operator->();
+ OpenGl_FrameBuffer* aFrameBuffer = myFBO.get();
bool toSwap = aCtx->IsRender()
&& !aCtx->caps->buffersNoSwap
&& aFrameBuffer == NULL;
const Graphic3d_StereoMode aStereoMode = myRenderParams.StereoMode;
Graphic3d_Camera::Projection aProjectType = myCamera->ProjectionType();
- OpenGl_FrameBuffer* aFrameBuffer = myFBO.operator->();
+ OpenGl_FrameBuffer* aFrameBuffer = myFBO.get();
aCtx->FrameStats()->FrameStart (myWorkspace->View(), true);
if ( aFrameBuffer == NULL
#endif
//TDF_Label InvLayerLab = LTool->FindLayer(aLayerName);
TDF_Label InvLayerLab = LTool->AddLayer(aLayerName); //skl for OCC3926
- Handle(TDataStd_UAttribute) aUAttr;
- aUAttr->Set(InvLayerLab, XCAFDoc::InvisibleGUID());
+ TDataStd_UAttribute::Set (InvLayerLab, XCAFDoc::InvisibleGUID());
}
}
return Standard_True;
if (myCurrentBucket->myCurrentSpace != myBucketSize) {
myLength++;
- myCurrentBucket->mySpace[myCurrentBucket->myCurrentSpace] = sp.operator->();
+ myCurrentBucket->mySpace[myCurrentBucket->myCurrentSpace] = sp.get();
return;
}
myCurrentBucket = myBuckets[myCurrentBucketNumber];
myCurrentBucket->myCurrentSpace++;
myLength++;
- myCurrentBucket->mySpace[myCurrentBucket->myCurrentSpace] = sp.operator->();
+ myCurrentBucket->mySpace[myCurrentBucket->myCurrentSpace] = sp.get();
}
//=======================================================================
Standard_Integer TopoDS_Shape::HashCode(const Standard_Integer Upper) const
{
//PKV
- const Standard_Integer aI = (Standard_Integer) ptrdiff_t(myTShape.operator->());
+ const Standard_Integer aI = (Standard_Integer) ptrdiff_t(myTShape.get());
const Standard_Integer aHS = ::HashCode(aI,Upper);
const Standard_Integer aHL = myLocation.HashCode(Upper);
return (aHS^aHL)%Upper;
Handle(XCAFDoc_GraphNode) aSHUO;
if (ShapeTool()->IsShape(L) || ShapeTool()->GetSHUO( L, aSHUO ) )
if (!L.FindAttribute(XCAFDoc::InvisibleGUID(), aUAttr))
- aUAttr->Set( L, XCAFDoc::InvisibleGUID() );
+ TDataStd_UAttribute::Set( L, XCAFDoc::InvisibleGUID() );
}
else L.ForgetAttribute( XCAFDoc::InvisibleGUID() );
}
Handle(XCAFDoc_GraphNode) aSHUO;
if (ShapeTool()->IsShape(L) || ShapeTool()->GetSHUO( L, aSHUO ) )
if (!L.FindAttribute(XCAFDoc::ColorByLayerGUID(), aUAttr))
- aUAttr->Set( L, XCAFDoc::ColorByLayerGUID() );
+ TDataStd_UAttribute::Set( L, XCAFDoc::ColorByLayerGUID() );
}
else L.ForgetAttribute( XCAFDoc::ColorByLayerGUID() );
}
Handle(TDataStd_UAttribute) aUAttr;
if (! isvisible ) {
if (!layerL.FindAttribute(XCAFDoc::InvisibleGUID(), aUAttr)) {
- aUAttr->Set( layerL, XCAFDoc::InvisibleGUID() );
+ TDataStd_UAttribute::Set( layerL, XCAFDoc::InvisibleGUID() );
}
}
else layerL.ForgetAttribute( XCAFDoc::InvisibleGUID() );