From 3af84898743f2a045a215c498d2fb77f2673b935 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 18 Dec 2014 18:11:55 +0300 Subject: [PATCH] 0022832: EDF GEOM: Bug with curve construction Additional commit: fix memory leak plus small redesign --- src/GEOM_I/GEOM_Object_i.cc | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index dcaf20289..08f2d1afd 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -366,14 +366,17 @@ bool GEOM_Object_i::IsShape() bool GEOM_Object_i::IsSame(GEOM::GEOM_BaseObject_ptr other) { - GEOM::GEOM_Object_ptr shapePtr = GEOM::GEOM_Object::_narrow( other ); - if ( CORBA::is_nil( shapePtr ) ) - return false; - TopoDS_Shape thisShape = _impl->GetValue(); - TopoDS_Shape otherShape; - Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast - ( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), shapePtr->GetEntry(), false )); - if ( !otherObject.IsNull() ) - otherShape = otherObject->GetValue(); - return thisShape.IsSame( otherShape ); + bool result = false; + + GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other ); + if ( !CORBA::is_nil( shapePtr ) ) { + Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast + ( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), shapePtr->GetEntry(), false )); + if ( !otherObject.IsNull() ) { + TopoDS_Shape thisShape = _impl->GetValue(); + TopoDS_Shape otherShape = otherObject->GetValue(); + result = !thisShape.IsNull() && !otherShape.IsNull() && thisShape.IsSame( otherShape ); + } + } + return result; } -- 2.39.2