diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-02-09 20:13:11 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-02-09 20:13:11 +1300 |
| commit | 3d480c088fa27c6dcadef40042a0e8deb3093985 (patch) | |
| tree | ab6b184b074261f608dff9b06b5a6e2e6bf52b30 /Source/Core/DiscIO | |
| parent | e62c9b0619a42f6e551ba928560fcb825b6ac9c5 (diff) | |
| parent | a11827cdf0ccc55b9a3f6259a27a9324e24cd018 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/CompressedBlob.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/DiscScrubber.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/DiscScrubber.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp index 48ce8f10f3..c4b1aa1385 100644 --- a/Source/Core/DiscIO/Src/CompressedBlob.cpp +++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp @@ -222,7 +222,7 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type, // u64 size = header.block_size; std::fill(in_buf, in_buf + header.block_size, 0); if (scrubbing) - DiscScrubber::GetNextBlock(inf.GetHandle(), in_buf); + DiscScrubber::GetNextBlock(inf, in_buf); else inf.ReadBytes(in_buf, header.block_size); z_stream z; diff --git a/Source/Core/DiscIO/Src/DiscScrubber.cpp b/Source/Core/DiscIO/Src/DiscScrubber.cpp index 841c8283cc..9ea4a1911d 100644 --- a/Source/Core/DiscIO/Src/DiscScrubber.cpp +++ b/Source/Core/DiscIO/Src/DiscScrubber.cpp @@ -127,7 +127,7 @@ bool SetupScrub(const char* filename, int block_size) return success; } -void GetNextBlock(FILE* in, u8* buffer) +void GetNextBlock(File::IOFile& in, u8* buffer) { u64 CurrentOffset = m_BlockCount * m_BlockSize; u64 i = CurrentOffset / CLUSTER_SIZE; @@ -136,12 +136,12 @@ void GetNextBlock(FILE* in, u8* buffer) { DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset); std::fill(buffer, buffer + m_BlockSize, 0xFF); - fseeko(in, m_BlockSize, SEEK_CUR); + in.Seek(m_BlockSize, SEEK_CUR); } else { DEBUG_LOG(DISCIO, "Used 0x%016llx", CurrentOffset); - fread(buffer, m_BlockSize, 1, in); + in.ReadBytes(buffer, m_BlockSize); } m_BlockCount++; diff --git a/Source/Core/DiscIO/Src/DiscScrubber.h b/Source/Core/DiscIO/Src/DiscScrubber.h index 2b17c7b2f4..d1d053f734 100644 --- a/Source/Core/DiscIO/Src/DiscScrubber.h +++ b/Source/Core/DiscIO/Src/DiscScrubber.h @@ -38,7 +38,7 @@ namespace DiscScrubber { bool SetupScrub(const char* filename, int block_size); -void GetNextBlock(FILE* in, u8* buffer); +void GetNextBlock(File::IOFile& in, u8* buffer); void Cleanup(); } // namespace DiscScrubber |