1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00

Compare commits

..

1 Commits

Author SHA1 Message Date
bugmaster
2ecd3a06a6 Update version up to 7.5.1.dev 2020-11-11 20:08:01 +03:00
3 changed files with 9 additions and 17 deletions

View File

@@ -20,15 +20,12 @@
#include <ShapeProcess_Context.hxx> #include <ShapeProcess_Context.hxx>
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <Standard_Mutex.hxx>
#include <Standard_Type.hxx> #include <Standard_Type.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TCollection_HAsciiString.hxx> #include <TCollection_HAsciiString.hxx>
#include <sys/stat.h> #include <sys/stat.h>
IMPLEMENT_STANDARD_RTTIEXT(ShapeProcess_Context, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(ShapeProcess_Context,Standard_Transient)
static Standard_Mutex THE_SHAPE_PROCESS_MUTEX;
//======================================================================= //=======================================================================
//function : ShapeProcess_Context //function : ShapeProcess_Context
@@ -76,7 +73,6 @@ Standard_Boolean ShapeProcess_Context::Init (const Standard_CString file,
Handle(Resource_Manager) ShapeProcess_Context::LoadResourceManager (const Standard_CString name) Handle(Resource_Manager) ShapeProcess_Context::LoadResourceManager (const Standard_CString name)
{ {
Standard_Mutex::Sentry aLock(&THE_SHAPE_PROCESS_MUTEX);
// Optimisation of loading resource file: file is load only once // Optimisation of loading resource file: file is load only once
// and reloaded only if file date has changed // and reloaded only if file date has changed
static Handle(Resource_Manager) sRC; static Handle(Resource_Manager) sRC;
@@ -131,7 +127,7 @@ Handle(Resource_Manager) ShapeProcess_Context::LoadResourceManager (const Standa
sUMtime = aUMtime; sUMtime = aUMtime;
} }
} }
return new Resource_Manager(*sRC); return sRC;
} }
//======================================================================= //=======================================================================

View File

@@ -35,19 +35,19 @@
// Primary definitions // Primary definitions
#define OCC_VERSION_MAJOR 7 #define OCC_VERSION_MAJOR 7
#define OCC_VERSION_MINOR 5 #define OCC_VERSION_MINOR 5
#define OCC_VERSION_MAINTENANCE 0 #define OCC_VERSION_MAINTENANCE 1
//! This macro must be commented in official release, and set to non-empty //! This macro must be commented in official release, and set to non-empty
//! string in other situations, to identify specifics of the version, e.g.: //! string in other situations, to identify specifics of the version, e.g.:
//! - "dev" for development version between releases //! - "dev" for development version between releases
//! - "beta..." or "rc..." for beta releases or release candidates //! - "beta..." or "rc..." for beta releases or release candidates
//! - "project..." for version containing project-specific fixes //! - "project..." for version containing project-specific fixes
//#define OCC_VERSION_DEVELOPMENT "beta" #define OCC_VERSION_DEVELOPMENT "dev"
// Derived (manually): version as real and string (major.minor) // Derived (manually): version as real and string (major.minor)
#define OCC_VERSION 7.5 #define OCC_VERSION 7.5
#define OCC_VERSION_STRING "7.5" #define OCC_VERSION_STRING "7.5"
#define OCC_VERSION_COMPLETE "7.5.0" #define OCC_VERSION_COMPLETE "7.5.1"
//! Derived: extended version as string ("major.minor.maintenance.dev") //! Derived: extended version as string ("major.minor.maintenance.dev")
#ifdef OCC_VERSION_DEVELOPMENT #ifdef OCC_VERSION_DEVELOPMENT

View File

@@ -64,9 +64,7 @@
#include <XSAlgo_ToolContainer.hxx> #include <XSAlgo_ToolContainer.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
IMPLEMENT_STANDARD_RTTIEXT(XSAlgo_AlgoContainer, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(XSAlgo_AlgoContainer,Standard_Transient)
static Standard_Mutex THE_RESOURCE_MUTEX;
//======================================================================= //=======================================================================
//function : XSAlgo_AlgoContainer //function : XSAlgo_AlgoContainer
@@ -169,11 +167,9 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape,
} }
// Define runtime tolerances and do Shape Processing // Define runtime tolerances and do Shape Processing
{ rsc->SetResource ( "Runtime.Tolerance", Prec );
Standard_Mutex::Sentry aLock(&THE_RESOURCE_MUTEX); rsc->SetResource ( "Runtime.MaxTolerance", maxTol );
rsc->SetResource("Runtime.Tolerance", Prec);
rsc->SetResource("Runtime.MaxTolerance", maxTol);
}
if ( !ShapeProcess::Perform(context, seq, theProgress) ) if ( !ShapeProcess::Perform(context, seq, theProgress) )
return shape; // return original shape return shape; // return original shape