From: ana <ana@opencascade.com>
Date: Wed, 17 Dec 2014 13:22:00 +0000 (+0300)
Subject: 0022832: EDF GEOM: Bug with curve construction
X-Git-Tag: V7_5_1b1~1^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=81701662553ea47c664d146a0c27de5951a1fbd0;p=modules%2Fgeom.git

0022832: EDF GEOM: Bug with curve construction
---

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 54e5c458d..dcaf20289 100644
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -364,15 +364,16 @@ bool GEOM_Object_i::IsShape()
   return !_impl->GetValue().IsNull() && _impl->GetType() != GEOM_MARKER;
 }
 
-bool GEOM_Object_i::IsSame(GEOM::GEOM_Object_ptr other)
+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;
-  if ( !CORBA::is_nil( other ) ) {
-    Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast
-      ( GEOM_Engine::GetEngine()->GetObject( other->GetStudyID(), other->GetEntry(), false ));
-    if ( !otherObject.IsNull() )
-      otherShape = otherObject->GetValue();
-  }
+  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 );
 }
diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh
index da7f035ed..b20020269 100644
--- a/src/GEOM_I/GEOM_Object_i.hh
+++ b/src/GEOM_I/GEOM_Object_i.hh
@@ -75,7 +75,7 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public
 
   virtual GEOM::GEOM_Object_ptr GetMainShape();
 
-  virtual bool IsSame(GEOM::GEOM_Object_ptr other);
+  virtual bool IsSame(GEOM::GEOM_BaseObject_ptr other);
 
   virtual bool IsShape();