From: azv <azv@opencascade.com>
Date: Thu, 20 Dec 2018 06:32:47 +0000 (+0300)
Subject: Avoid regression in Pipe unit tests
X-Git-Tag: End2018~20
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=57da53bdb609f84fe8b58b2811cf1c55be5b6579;p=modules%2Fshaper.git

Avoid regression in Pipe unit tests
---

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp
index 4ce80d3ff..57cfdf985 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp
@@ -77,15 +77,26 @@ GeomAlgoAPI_Pipe::GeomAlgoAPI_Pipe(const ListOfShape& theBaseShapes,
 void GeomAlgoAPI_Pipe::build(const GeomShapePtr theBaseShape,
                              const GeomShapePtr thePathShape)
 {
-  // Getting base shape and path.
-  TopoDS_Shape aBaseShape;
-  TopAbs_ShapeEnum aBaseShapeType;
-  TopoDS_Wire aPathWire;
-  if (!getBase(aBaseShape, aBaseShapeType, theBaseShape) ||
-      !getPath(aPathWire, thePathShape)) {
+  // Getting base shape.
+  if(!theBaseShape.get()) {
+    return;
+  }
+  TopoDS_Shape aBaseShape = theBaseShape->impl<TopoDS_Shape>();
+  if(aBaseShape.IsNull()) {
+    return;
+  }
+  TopAbs_ShapeEnum aBaseShapeType = aBaseShape.ShapeType();
+  if(aBaseShapeType != TopAbs_VERTEX && aBaseShapeType != TopAbs_EDGE &&
+     aBaseShapeType != TopAbs_WIRE && aBaseShapeType != TopAbs_FACE &&
+     aBaseShapeType != TopAbs_SHELL && aBaseShapeType != TopAbs_COMPOUND) {
     return;
   }
 
+  // Getting path.
+  TopoDS_Wire aPathWire;
+  if(!getPath(aPathWire, thePathShape)) {
+    return;
+  }
   aPathWire.Move(getPathToBaseTranslation(aBaseShape, aPathWire));
 
   // Making pipe.