The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 20:06:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kill auto usage in CISOBlob.cpp per request.

Browse Source
This commit is contained in:
Jordan Woyak 2014-02-13 16:09:58 -06:00
parent cec8ac20fc
commit d6f6672522
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DiscIO/CISOBlob.cpp
View File

@ -53,14 +53,14 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
{ {
while (nbytes != 0) while (nbytes != 0)
{ {
auto const block = offset / m_block_size; u64 const block = offset / m_block_size;
auto const data_offset = offset % m_block_size; u64 const data_offset = offset % m_block_size;
u64 const bytes_to_read = std::min(m_block_size - data_offset, nbytes);
auto const bytes_to_read = std::min(m_block_size - data_offset, nbytes);
if (block < CISO_MAP_SIZE && UNUSED_BLOCK_ID != m_ciso_map[block]) if (block < CISO_MAP_SIZE && UNUSED_BLOCK_ID != m_ciso_map[block])
{ {
// calculate the base address // calculate the base address
auto const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * (u64)m_block_size + data_offset; u64 const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * (u64)m_block_size + data_offset;
if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read))) if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read)))
return false; return false;