ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4485 from ligfx/fixmin 

DolphinQt2: InfoWidget: explicit type for std::min
This commit is contained in:
Markus Wick 2016-12-03 11:15:00 +01:00 committed by GitHub
parent 0e93bad737 f798bcd5c0
commit 827de2ed06
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/Config/InfoWidget.cpp
View File

@ -187,7 +187,7 @@ void InfoWidget::ComputeChecksum()
if (progress->wasCanceled()) if (progress->wasCanceled())
return; return;
u64 read_size = std::min(file_data.size(), game_size - read_offset); u64 read_size = std::min<u64>(file_data.size(), game_size - read_offset);
file->Read(read_offset, read_size, file_data.data()); file->Read(read_offset, read_size, file_data.data());
hash.addData(reinterpret_cast<char*>(file_data.data()), read_size); hash.addData(reinterpret_cast<char*>(file_data.data()), read_size);
read_offset += read_size; read_offset += read_size;