EgtGeomKernel :

- ricompilazione con VS2026.
This commit is contained in:
DarioS
2026-08-24 09:34:37 +02:00
parent 7bfeba4a54
commit c64f9f482b
4 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -30,7 +30,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -46,7 +46,7 @@
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset>v145</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
+4 -4
View File
@@ -884,7 +884,7 @@ VolZmap::CheckMapConnection( void)
}
}
// Numero massimo di thread
int nThreadMax = max( 1, int( thread::hardware_concurrency()) - 1) ;
int nThreadMax = max( 1, int( thread::hardware_concurrency())) ;
// Ciclo sui dexel lungo Z
for ( int tI = 0 ; tI < m_nNx[0] ; ++ tI) {
for ( int tJ = 0 ; tJ < m_nNy[0] ; ++ tJ) {
@@ -1572,7 +1572,7 @@ VolZmap::AddSurfTm( const ISurfTriMesh* pStm)
IntersParLinesSurfTm intPLSTM( frMapFrame, *pStm) ;
// numero massimo di thread
int nThreadMax = max( 1, int( thread::hardware_concurrency()) - 1) ;
int nThreadMax = max( 1, int( thread::hardware_concurrency())) ;
vector<future<bool>> vRes ;
vRes.resize( nThreadMax) ;
// se dimensione griglia in X maggiore di dimensione Y
@@ -1660,7 +1660,7 @@ VolZmap::SubtractSurfTm( const ISurfTriMesh* pStm)
IntersParLinesSurfTm intPLSTM( frMapFrame, *pStm) ;
// numero massimo di thread
int nThreadMax = max( 1, int( thread::hardware_concurrency()) - 1) ;
int nThreadMax = max( 1, int( thread::hardware_concurrency())) ;
vector<future<bool>> vRes ;
vRes.resize( nThreadMax) ;
// se dimensione griglia in X maggiore di dimensione Y
@@ -2267,7 +2267,7 @@ VolZmap::IsBox( void)
if ( m_nMapNum == 1)
return false ;
// Numero massimo di thread per il calcolo parallelo.
int nThreadMax = max( 1, int( thread::hardware_concurrency()) - 1) ;
int nThreadMax = max( 1, int( thread::hardware_concurrency())) ;
// Disponibile un solo thread
if ( nThreadMax == 1) {
for ( int nMap = 0 ; nMap < m_nMapNum ; ++ nMap) {
+1 -1
View File
@@ -994,7 +994,7 @@ VolZmap::CreateFromTriMesh( const ISurfTriMesh& Surf, double dStep, bool bTriDex
if ( MULTITHREAD) {
// Numero massimo di thread
int nThreadMax = max( 1, int( thread::hardware_concurrency()) - 1) ;
int nThreadMax = max( 1, int( thread::hardware_concurrency())) ;
vector< future<bool>> vRes ;
vRes.resize( nThreadMax) ;
if ( m_nNx[nG] > m_nNy[nG]) {
+1 -1
View File
@@ -734,7 +734,7 @@ VolZmap::AddSurfTmForOffset( const ISurfTriMesh* pStm, int nTool)
IntersParLinesSurfTm intPLSTM( frMapFrame, *pStm) ;
// numero massimo di thread
int nThreadMax = max( 1, int( thread::hardware_concurrency()) - 1) ;
int nThreadMax = max( 1, int( thread::hardware_concurrency())) ;
vector<future<bool>> vRes ;
vRes.resize( nThreadMax) ;
// se dimensione griglia in X maggiore di dimensione Y