Merge pull request #533 from xBimTeam/develop

Stability fixes for #526 and #532

Author: andyward

Xbim.Geometry.Engine/OCC/src/Standard/Standard_OutOfMemory.cxx

@@ -86,18 +86,27 @@ void Standard_OutOfMemory::Raise(Standard_SStream& theMessage)
 //purpose  :
 //=======================================================================
 
+// AW Jan 2025: Replaced static instance with dynamically allocated once since this static resource triggers error code C0020001 to be returned 
+// when the host process exits, due to C's atexit() disposal of managed resources after CLR shutdown. Results in https://github.com/xBimTeam/XbimGeometry/issues/438
+// See https://learn.microsoft.com/en-us/archive/blogs/cbrumme/error-c0020001
+// There may be better workarounds than this, but given future v6 GE integrates OCC dynamically and don't have the issue a tactical fix will have to do
+// This is likely to mean OutOfMemory conditions may not raise an error correctly, at the expense of the majority of cases having a clean exit code.
+// 
 // global instance must be allocated at load-time
-static Handle(Standard_OutOfMemory) anOutOfMemInstance = new Standard_OutOfMemory;
+//static Handle(Standard_OutOfMemory) anOutOfMemInstance = new Standard_OutOfMemory;
 
 Handle(Standard_OutOfMemory) Standard_OutOfMemory::NewInstance (Standard_CString theMessage)
 {
+  Handle(Standard_OutOfMemory) anOutOfMemInstance = new Standard_OutOfMemory;
+
   anOutOfMemInstance->SetMessageString (theMessage);
   return anOutOfMemInstance;
 }
 
 Handle(Standard_OutOfMemory) Standard_OutOfMemory::NewInstance (Standard_CString theMessage,
                                                                 Standard_CString theStackTrace)
 {
+  Handle(Standard_OutOfMemory) anOutOfMemInstance = new Standard_OutOfMemory;
   anOutOfMemInstance->SetMessageString (theMessage);
   anOutOfMemInstance->SetStackString (theStackTrace);
   return anOutOfMemInstance;

Xbim.Geometry.Engine/XbimWire.cpp

@@ -234,23 +234,27 @@ namespace Xbim
 					// todo: this code is not quite robust, it did not manage to close fairly simple polylines.
 					try
 					{
+						const double oneMilli = profile->Model->ModelFactors->OneMilliMeter;
+						const double modelPrecision = profile->Model->ModelFactors->Precision;
+						XbimFace^ xbimFace = gcnew XbimFace(loop, true, oneMilli, profile->OuterCurve->EntityLabel, logger);
 
-
-						double oneMilli = profile->Model->ModelFactors->OneMilliMeter;
-						TopoDS_Face face = gcnew XbimFace(loop, true, oneMilli, profile->OuterCurve->EntityLabel, logger);
-						ShapeFix_Wire wireFixer(loop, face, profile->Model->ModelFactors->Precision);
-						wireFixer.ClosedWireMode() = Standard_True;
-						wireFixer.FixGaps2dMode() = Standard_True;
-						wireFixer.FixGaps3dMode() = Standard_True;
-						wireFixer.ModifyGeometryMode() = Standard_True;
-						wireFixer.SetMinTolerance(profile->Model->ModelFactors->Precision);
-						wireFixer.SetPrecision(oneMilli);
-						wireFixer.SetMaxTolerance(oneMilli * 10);
-						Standard_Boolean closed = wireFixer.Perform();
-						if (closed)
-							*pWire = wireFixer.Wire();
-						else
-							*pWire = loop;
+						if (xbimFace->IsValid)
+						{
+							TopoDS_Face face = xbimFace;
+							ShapeFix_Wire wireFixer(loop, face, modelPrecision);
+							wireFixer.ClosedWireMode() = Standard_True;
+							wireFixer.FixGaps2dMode() = Standard_True;
+							wireFixer.FixGaps3dMode() = Standard_True;
+							wireFixer.ModifyGeometryMode() = Standard_True;
+							wireFixer.SetMinTolerance(modelPrecision);
+							wireFixer.SetPrecision(oneMilli);
+							wireFixer.SetMaxTolerance(oneMilli * 10);
+							Standard_Boolean closed = wireFixer.Perform();
+							if (closed)
+								*pWire = wireFixer.Wire();
+							else
+								*pWire = loop;
+						}
 					}
 					catch (Standard_Failure sf)
 					{