Revamp exception handling. ImportErrorException renamed to DeadlyImportError to avoid silent regressions. Exceptions now thrown by value, and caught by reference. Put guards in all C++ and C API functions to avoid unwanted exception propagation across module and language boundaries.
PLEASE TEST CAREFULLY IF THIS SHOULD CAUSE REGRESSIONS. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@617 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -86,7 +86,7 @@ void RAWImporter::InternReadFile( const std::string& pFile,
|
||||
|
||||
// Check whether we can read from the file
|
||||
if( file.get() == NULL) {
|
||||
throw new ImportErrorException( "Failed to open RAW file " + pFile + ".");
|
||||
throw DeadlyImportError( "Failed to open RAW file " + pFile + ".");
|
||||
}
|
||||
|
||||
// allocate storage and copy the contents of the file to a memory buffer
|
||||
@@ -218,7 +218,7 @@ void RAWImporter::InternReadFile( const std::string& pFile,
|
||||
|
||||
if (!pScene->mNumMeshes)
|
||||
{
|
||||
throw new ImportErrorException("RAW: No meshes loaded. The file seems to be corrupt or empty.");
|
||||
throw DeadlyImportError("RAW: No meshes loaded. The file seems to be corrupt or empty.");
|
||||
}
|
||||
|
||||
pScene->mMeshes = new aiMesh*[pScene->mNumMeshes];
|
||||
|
||||
Reference in New Issue
Block a user