Avoid regression in Pipe unit tests

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_Pipe.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp
index 4ce80d3ffb0849a8149e182400328aaa2bbf6ae2..57cfdf98518872e4048059ca0c37f32d76cfd359 100644 (file)
--- 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.