artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix mingw compile error and warnings

Browse source
This commit is contained in:
James Rowe 2019-01-21 09:39:45 -07:00
parent 3ca0af8bb3
commit 372245e0b5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yuzu/loading_screen.cpp
View file

@ -120,8 +120,8 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
map.loadFromData(buffer.data(), buffer.size());
ui->banner->setPixmap(map);
#else
backing_mem =
std::make_unique<QByteArray>(reinterpret_cast<char*>(buffer.data()), buffer.size());
backing_mem = std::make_unique<QByteArray>(reinterpret_cast<char*>(buffer.data()),
static_cast<int>(buffer.size()));
backing_buf = std::make_unique<QBuffer>(backing_mem.get());
backing_buf->open(QIODevice::ReadOnly);
animation = std::make_unique<QMovie>(backing_buf.get(), QByteArray());
@ -132,7 +132,7 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
}
if (loader.ReadLogo(buffer) == Loader::ResultStatus::Success) {
QPixmap map;
map.loadFromData(buffer.data(), buffer.size());
map.loadFromData(buffer.data(), static_cast<uint>(buffer.size()));
ui->logo->setPixmap(map);
}
@ -163,7 +163,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
}
// update the max of the progress bar if the number of shaders change
if (total != previous_total) {
ui->progress_bar->setMaximum(total);
ui->progress_bar->setMaximum(static_cast<int>(total));
previous_total = total;
}
@ -192,7 +192,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
// update labels and progress bar
ui->stage->setText(stage_translations[stage].arg(value).arg(total));
ui->value->setText(estimate);
ui->progress_bar->setValue(value);
ui->progress_bar->setValue(static_cast<int>(value));
previous_time = now;
}

2
src/yuzu/loading_screen.h
View file

@ -74,7 +74,7 @@ private:
VideoCore::LoadCallbackStage previous_stage;
QGraphicsOpacityEffect* opacity_effect = nullptr;
std::unique_ptr<QPropertyAnimation> fadeout_animation = nullptr;
std::unique_ptr<QPropertyAnimation> fadeout_animation;
// Definitions for the differences in text and styling for each stage
std::unordered_map<VideoCore::LoadCallbackStage, const char*> progressbar_style;