try to fix build.

pull/703/head^2
Kim Kulling 2015-12-07 20:43:01 +01:00
parent f5e13874e0
commit 0a6788d56f
2 changed files with 55 additions and 51 deletions

View File

@ -64,7 +64,7 @@ using namespace Assimp::Collada;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
: mFileName( pFile)
: mFileName( pFile )
, mReader( NULL )
, mDataLibrary()
, mAccessorLibrary()
@ -82,7 +82,7 @@ ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
, mUpDirection( UP_Y )
, mFormat(FV_1_5_n ) // We assume the newest file format by default
{
// Validate io-handler instance
// validate io-handler instance
if ( NULL == pIOHandler ) {
throw DeadlyImportError("IOSystem is NULL." );
}
@ -103,8 +103,8 @@ ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
// start reading
ReadContents();
// Release file after import
pIOHandler->Close( file.get() );
// release file after import
//pIOHandler->Close( file.get() );
}
// ------------------------------------------------------------------------------------------------

View File

@ -264,6 +264,7 @@ def del_folder_with_contents(folder):
def run_test():
tmp_target_path = os.path.join(settings.results, "tmp")
try:
print "try to make " + tmp_target_path
os.mkdir(tmp_target_path)
except OSError as oerr:
# clear contents if tmp folder exists already
@ -292,7 +293,10 @@ def run_test():
# -------------------------------------------------------------------------------
if __name__ == "__main__":
assimp_bin_path = sys.argv[1] if len(sys.argv) > 1 else 'assimp'
if len(sys.argv) > 1:
assimp_bin_path = sys.argv[1]
else:
assimp_bin_path = 'assimp'
print('Using assimp binary: ' + assimp_bin_path)
sys.exit( run_test() )