Increment OCCT version up to 7.5.0

0031898: Coding Rules - extend Standard_WarningsDisable.hxx with -Wreorder
0029108: Crash writing STEP file
2025-08-19 13:40:49 +03:00 · 2020-11-02 19:52:44 +03:00 · 2020-11-02 19:41:29 +03:00 · 2020-11-02 14:32:39 +03:00
4 changed files with 26 additions and 1 deletions
--- a/src/Standard/Standard_Version.hxx
+++ b/src/Standard/Standard_Version.hxx
@@ -42,7 +42,7 @@
 //! - "dev" for development version between releases
 //! - "beta..." or "rc..." for beta releases or release candidates
 //! - "project..." for version containing project-specific fixes
-#define OCC_VERSION_DEVELOPMENT   "beta"
+//#define OCC_VERSION_DEVELOPMENT   "beta"

 // Derived (manually): version as real and string (major.minor)
 #define OCC_VERSION               7.5
--- a/src/Standard/Standard_WarningsDisable.hxx
+++ b/src/Standard/Standard_WarningsDisable.hxx
@@ -40,6 +40,7 @@
  #pragma GCC diagnostic ignored "-Wunused-variable"
  #pragma GCC diagnostic ignored "-Wunused-parameter"
  #pragma GCC diagnostic ignored "-Wenum-compare"
+  #pragma GCC diagnostic ignored "-Wreorder"
  #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
  #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
@@ -180,6 +180,8 @@ void TopoDSToStep_MakeStepFace::Init(const TopoDS_Face& aFace,
    return;
  }
  
+  try
+  {
  // -----------------
  // Translate Surface
  // -----------------
@@ -465,6 +467,13 @@ void TopoDSToStep_MakeStepFace::Init(const TopoDS_Face& aFace,
    myError = TopoDSToStep_NoWireMapped;
    done    = Standard_False;
  }
+  }
+  catch (Standard_Failure const& theFailure) 
+  {
+    FP->AddFail(errShape, theFailure.GetMessageString());
+    myError = TopoDSToStep_FaceOther;
+    done    = Standard_False;
+  }
 }

  
--- a/tests/bugs/step/bug29108
+++ b/tests/bugs/step/bug29108
@@ -0,0 +1,15 @@
+puts "=========="
+puts "0029108: Data Exchange - Crash writing STEP file"
+puts "=========="
+puts ""
+
+restore [locate_data_file bug29108.brep] part
+stepwrite a part $imagedir/bug229108_temp.stp
+dall
+stepread ${imagedir}/bug229108_temp.stp a *
+
+tpcompound result
+checkprops result -s 11833
+checkshape result
+checknbshapes result -vertex 251 -edge 380 -wire 155 -face 141 -shell 3 -solid 2 -compsolid 0 -compound 4 -shape 936
+
Author	SHA1	Message	Date
bugmaster	628c0211d5	Increment OCCT version up to 7.5.0	2020-11-02 19:52:44 +03:00
kgv	dbecff5fab	0031898: Coding Rules - extend Standard_WarningsDisable.hxx with -Wreorder	2020-11-02 19:41:29 +03:00
asuraven	7a88ce5b98	0029108: Crash writing STEP file * Wrapped a try / catch block on creating objects in TopoDSToStep_MakeStepFace::Init()	2020-11-02 14:32:39 +03:00