ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-09 18:33:06 +05:00
Code Issues Packages Projects Releases Wiki Activity

same fix as in SignCAD()

Browse Source
This commit is contained in:
eap 2021-08-19 17:09:28 +03:00
parent 4a8f4b4c1c
commit 499331b207
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx
View File

@ -373,7 +373,6 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
} }
else else
{ {
SMESH_TRY; SMESH_TRY;
ok = signFun( meshgems_cad ); ok = signFun( meshgems_cad );
@ -403,6 +402,7 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
if ( !loadLibrary( error, libraryFile )) if ( !loadLibrary( error, libraryFile ))
return false; return false;
bool ok = false;
typedef bool (*SignFun)(void* ); typedef bool (*SignFun)(void* );
SignFun signFun = (SignFun) GetProc( theLibraryHandle, "SignMesh" ); SignFun signFun = (SignFun) GetProc( theLibraryHandle, "SignMesh" );
if ( !signFun ) if ( !signFun )
@ -410,19 +410,19 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
if ( ! getLastError( error )) if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'SignMesh' in '") << getenv( theEnvVar ) << "'"; error = SMESH_Comment( "Can't find symbol 'SignMesh' in '") << getenv( theEnvVar ) << "'";
} }
bool ok; else
{
SMESH_TRY;
SMESH_TRY; ok = signFun( meshgems_mesh );
ok = signFun( meshgems_mesh ); SMESH_CATCH( SMESH::returnError );
SMESH_CATCH( SMESH::returnError );
if ( !error.empty() )
ok = false;
else if ( !ok )
error = "SignMesh() failed (located in '" + libraryFile._name + "')";
if ( !error.empty() )
ok = false;
else if ( !ok )
error = "SignMesh() failed (located in '" + libraryFile._name + "')";
}
return ok; return ok;
} }
@ -455,8 +455,10 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
if ( ! getLastError( error )) if ( ! getLastError( error ))
error = SMESH_Comment( "Can't find symbol 'GetKey' in '") << getenv( theEnvVar ) << "'"; error = SMESH_Comment( "Can't find symbol 'GetKey' in '") << getenv( theEnvVar ) << "'";
} }
key = keyFun( gmfFile, nbVertex, nbEdge, nbFace, nbVol ); else
{
key = keyFun( gmfFile, nbVertex, nbEdge, nbFace, nbVol );
}
if ( key.empty() ) if ( key.empty() )
error = "GetKey() failed (located in '" + libraryFile._name + "')"; error = "GetKey() failed (located in '" + libraryFile._name + "')";