From fe6ea9b09584d1fa694452a9eb130e7ebf7a56e9 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 22 Nov 2022 14:18:59 +0300 Subject: [PATCH 1/2] Increment version: 9.10.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21b0c03ec..66554ec1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ ENDIF() # Versioning # =========== -SALOME_SETUP_VERSION(9.9.0 DEVELOPMENT) +SALOME_SETUP_VERSION(9.10.0) MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") # Find KERNEL From abd699810f0d9758075b9a4158d94d4965b06539 Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 18 Nov 2022 18:19:11 +0300 Subject: [PATCH 2/2] [bos #32720] EDF 25230 - partition fails on small case --- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 4875c4eb6..e4c3925ad 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -423,14 +423,16 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& lo return 0; } - //Alternative case to check not valid partition IPAL21418 - TopoDS_Iterator It (aShape, Standard_True, Standard_True); - int nbSubshapes = 0; - for (; It.More(); It.Next()) - nbSubshapes++; - if (!nbSubshapes) - Standard_ConstructionError::Raise("Partition aborted : non valid shape result"); - //end of IPAL21418 + if (aShape.ShapeType() != TopAbs_VERTEX) { + //Alternative case to check not valid partition IPAL21418 + TopoDS_Iterator It (aShape, Standard_True, Standard_True); + int nbSubshapes = 0; + for (; It.More(); It.Next()) + nbSubshapes++; + if (!nbSubshapes) + Standard_ConstructionError::Raise("Partition aborted : non valid shape result"); + //end of IPAL21418 + } if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) ) Standard_ConstructionError::Raise("Partition aborted : non valid shape result");