From c769f8d4ad3b671f2e824fa3d9142e4f7e9a2ae4 Mon Sep 17 00:00:00 2001 From: Joshua Hyatt Date: Sat, 29 Aug 2020 22:21:34 -0600 Subject: [PATCH 1/5] Replace unique_ptr with raw pointer to avoid destructing stream --- code/AssetLib/Obj/ObjFileImporter.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/AssetLib/Obj/ObjFileImporter.cpp b/code/AssetLib/Obj/ObjFileImporter.cpp index b6e1f9061..794cb8ec0 100644 --- a/code/AssetLib/Obj/ObjFileImporter.cpp +++ b/code/AssetLib/Obj/ObjFileImporter.cpp @@ -107,8 +107,8 @@ const aiImporterDesc *ObjFileImporter::GetInfo() const { void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSystem *pIOHandler) { // Read file into memory static const std::string mode = "rb"; - std::unique_ptr fileStream(pIOHandler->Open(file, mode)); - if (!fileStream.get()) { + IOStream *fileStream = pIOHandler->Open(file, mode); + if (!fileStream) { throw DeadlyImportError("Failed to open file " + file + "."); } @@ -119,10 +119,10 @@ void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, I } IOStreamBuffer streamedBuffer; - streamedBuffer.open(fileStream.get()); + streamedBuffer.open(fileStream); // Allocate buffer and read file into it - //TextFileToBuffer( fileStream.get(),m_Buffer); + //TextFileToBuffer( fileStream,m_Buffer); // Get the model name std::string modelName, folderName; @@ -145,6 +145,8 @@ void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, I streamedBuffer.close(); + pIOHandler->Close(fileStream); + // Clean up allocated storage for the next import m_Buffer.clear(); From cc2613f2644fd7ccb8730be871aba1de25128d49 Mon Sep 17 00:00:00 2001 From: Joshua Hyatt Date: Sat, 29 Aug 2020 23:06:33 -0600 Subject: [PATCH 2/5] Replace unique_ptr with raw pointer --- code/AssetLib/FBX/FBXImporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp index 8c908be40..61f67b382 100644 --- a/code/AssetLib/FBX/FBXImporter.cpp +++ b/code/AssetLib/FBX/FBXImporter.cpp @@ -141,7 +141,7 @@ void FBXImporter::SetupProperties(const Importer *pImp) { // ------------------------------------------------------------------------------------------------ // Imports the given file into the given scene structure. void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) { - std::unique_ptr stream(pIOHandler->Open(pFile, "rb")); + IOStream* stream = pIOHandler->Open(pFile, "rb"); if (!stream) { ThrowException("Could not open file for reading"); } From 953e976de6f7c771cef880c7537407a76fb64d64 Mon Sep 17 00:00:00 2001 From: Joshua Hyatt Date: Sat, 29 Aug 2020 23:56:50 -0600 Subject: [PATCH 3/5] Close stream when finished --- code/AssetLib/FBX/FBXImporter.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp index 61f67b382..564317afe 100644 --- a/code/AssetLib/FBX/FBXImporter.cpp +++ b/code/AssetLib/FBX/FBXImporter.cpp @@ -159,6 +159,8 @@ void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy contents[contents.size() - 1] = 0; const char *const begin = &*contents.begin(); + pIOHandler->Close(stream); + // broadphase tokenizing pass in which we identify the core // syntax elements of FBX (brackets, commas, key:value mappings) TokenList tokens; From dcf9a7b2d8b2955f3594c43be9bd9a85c3f0db3d Mon Sep 17 00:00:00 2001 From: Joshua Hyatt Date: Sat, 29 Aug 2020 23:58:31 -0600 Subject: [PATCH 4/5] Conform variable names to code standards --- code/AssetLib/FBX/FBXImporter.cpp | 10 +++++----- code/AssetLib/Obj/ObjFileImporter.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp index 564317afe..0ecb10daa 100644 --- a/code/AssetLib/FBX/FBXImporter.cpp +++ b/code/AssetLib/FBX/FBXImporter.cpp @@ -141,8 +141,8 @@ void FBXImporter::SetupProperties(const Importer *pImp) { // ------------------------------------------------------------------------------------------------ // Imports the given file into the given scene structure. void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) { - IOStream* stream = pIOHandler->Open(pFile, "rb"); - if (!stream) { + IOStream* pStream = pIOHandler->Open(pFile, "rb"); + if (!pStream) { ThrowException("Could not open file for reading"); } @@ -154,12 +154,12 @@ void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy // streaming for its output data structures so the net win with // streaming input data would be very low. std::vector contents; - contents.resize(stream->FileSize() + 1); - stream->Read(&*contents.begin(), 1, contents.size() - 1); + contents.resize(pStream->FileSize() + 1); + pStream->Read(&*contents.begin(), 1, contents.size() - 1); contents[contents.size() - 1] = 0; const char *const begin = &*contents.begin(); - pIOHandler->Close(stream); + pIOHandler->Close(pStream); // broadphase tokenizing pass in which we identify the core // syntax elements of FBX (brackets, commas, key:value mappings) diff --git a/code/AssetLib/Obj/ObjFileImporter.cpp b/code/AssetLib/Obj/ObjFileImporter.cpp index 794cb8ec0..2f330b729 100644 --- a/code/AssetLib/Obj/ObjFileImporter.cpp +++ b/code/AssetLib/Obj/ObjFileImporter.cpp @@ -107,22 +107,22 @@ const aiImporterDesc *ObjFileImporter::GetInfo() const { void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSystem *pIOHandler) { // Read file into memory static const std::string mode = "rb"; - IOStream *fileStream = pIOHandler->Open(file, mode); - if (!fileStream) { + IOStream *pFileStream = pIOHandler->Open(file, mode); + if (!pFileStream) { throw DeadlyImportError("Failed to open file " + file + "."); } // Get the file-size and validate it, throwing an exception when fails - size_t fileSize = fileStream->FileSize(); + size_t fileSize = pFileStream->FileSize(); if (fileSize < ObjMinSize) { throw DeadlyImportError("OBJ-file is too small."); } IOStreamBuffer streamedBuffer; - streamedBuffer.open(fileStream); + streamedBuffer.open(pFileStream); // Allocate buffer and read file into it - //TextFileToBuffer( fileStream,m_Buffer); + //TextFileToBuffer( pFileStream,m_Buffer); // Get the model name std::string modelName, folderName; @@ -145,7 +145,7 @@ void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, I streamedBuffer.close(); - pIOHandler->Close(fileStream); + pIOHandler->Close(pFileStream); // Clean up allocated storage for the next import m_Buffer.clear(); From 638499a2783aa5a2fd494aebbb404147dcc964e4 Mon Sep 17 00:00:00 2001 From: Joshua Hyatt Date: Tue, 1 Sep 2020 10:30:31 -0600 Subject: [PATCH 5/5] Replace unique_ptr and add custom deleter --- code/AssetLib/FBX/FBXImporter.cpp | 13 +++++++------ code/AssetLib/Obj/ObjFileImporter.cpp | 15 ++++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp index 0ecb10daa..f80b65cd4 100644 --- a/code/AssetLib/FBX/FBXImporter.cpp +++ b/code/AssetLib/FBX/FBXImporter.cpp @@ -141,8 +141,11 @@ void FBXImporter::SetupProperties(const Importer *pImp) { // ------------------------------------------------------------------------------------------------ // Imports the given file into the given scene structure. void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) { - IOStream* pStream = pIOHandler->Open(pFile, "rb"); - if (!pStream) { + auto streamCloser = [&](IOStream *pStream) { + pIOHandler->Close(pStream); + }; + std::unique_ptr stream(pIOHandler->Open(pFile, "rb"), streamCloser); + if (!stream) { ThrowException("Could not open file for reading"); } @@ -154,13 +157,11 @@ void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy // streaming for its output data structures so the net win with // streaming input data would be very low. std::vector contents; - contents.resize(pStream->FileSize() + 1); - pStream->Read(&*contents.begin(), 1, contents.size() - 1); + contents.resize(stream->FileSize() + 1); + stream->Read(&*contents.begin(), 1, contents.size() - 1); contents[contents.size() - 1] = 0; const char *const begin = &*contents.begin(); - pIOHandler->Close(pStream); - // broadphase tokenizing pass in which we identify the core // syntax elements of FBX (brackets, commas, key:value mappings) TokenList tokens; diff --git a/code/AssetLib/Obj/ObjFileImporter.cpp b/code/AssetLib/Obj/ObjFileImporter.cpp index 2f330b729..4fa122c45 100644 --- a/code/AssetLib/Obj/ObjFileImporter.cpp +++ b/code/AssetLib/Obj/ObjFileImporter.cpp @@ -107,22 +107,25 @@ const aiImporterDesc *ObjFileImporter::GetInfo() const { void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSystem *pIOHandler) { // Read file into memory static const std::string mode = "rb"; - IOStream *pFileStream = pIOHandler->Open(file, mode); - if (!pFileStream) { + auto streamCloser = [&](IOStream *pStream) { + pIOHandler->Close(pStream); + }; + std::unique_ptr fileStream(pIOHandler->Open(file, mode), streamCloser); + if (!fileStream.get()) { throw DeadlyImportError("Failed to open file " + file + "."); } // Get the file-size and validate it, throwing an exception when fails - size_t fileSize = pFileStream->FileSize(); + size_t fileSize = fileStream->FileSize(); if (fileSize < ObjMinSize) { throw DeadlyImportError("OBJ-file is too small."); } IOStreamBuffer streamedBuffer; - streamedBuffer.open(pFileStream); + streamedBuffer.open(fileStream.get()); // Allocate buffer and read file into it - //TextFileToBuffer( pFileStream,m_Buffer); + //TextFileToBuffer( fileStream.get(),m_Buffer); // Get the model name std::string modelName, folderName; @@ -145,8 +148,6 @@ void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, I streamedBuffer.close(); - pIOHandler->Close(pFileStream); - // Clean up allocated storage for the next import m_Buffer.clear();