diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
| commit | 57d4ba8dcca69e26a7897a90a4c01b5922d276b1 (patch) | |
| tree | 47bd045f33336b5228a928a065093bdd81fc5cbb /Source/Core/DiscIO/Src/FileHandlerARC.cpp | |
| parent | bad4f7f790b6038450488d1c23d8b65329cea4b4 (diff) | |
| parent | 40d919b352a553913f2c1e93e9fa39f2b968b04b (diff) | |
Merge branch 'master' into new-ax-hle
Diffstat (limited to 'Source/Core/DiscIO/Src/FileHandlerARC.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/FileHandlerARC.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp index a9e4beee5d..63a4876718 100644 --- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp @@ -27,19 +27,19 @@ namespace DiscIO { CARCFile::CARCFile(const std::string& _rFilename) - : m_pBuffer(NULL) - , m_Initialized(false) + : m_pBuffer(NULL) + , m_Initialized(false) { - DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str()); - if (pReader != NULL) - { - u64 FileSize = pReader->GetDataSize(); - m_pBuffer = new u8[(u32)FileSize]; - pReader->Read(0, FileSize, m_pBuffer); - delete pReader; - - m_Initialized = ParseBuffer(); - } + DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str()); + if (pReader != NULL) + { + u64 FileSize = pReader->GetDataSize(); + m_pBuffer = new u8[(u32)FileSize]; + pReader->Read(0, FileSize, m_pBuffer); + delete pReader; + + m_Initialized = ParseBuffer(); + } } CARCFile::CARCFile(const std::string& _rFilename, u32 offset) |