diff options
author | Alexander Laties <alex.laties@gmail.com> | 2016-04-25 22:10:03 +0200 |
---|---|---|
committer | Alexander Laties <alex.laties@gmail.com> | 2016-05-07 17:41:55 +0200 |
commit | 0a31e373f1728316b3dfed391ddcb99a474e4102 (patch) | |
tree | 1b1bcf1af2398481e7208610f6a2e49264fe11db /src/citra_qt | |
parent | Merge pull request #1736 from MerryMage/sdl2-sink (diff) | |
download | yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.gz yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.bz2 yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.lz yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.xz yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.zst yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/util/util.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index 6e8d7ef42..854f6ff16 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp @@ -515,7 +515,7 @@ void GraphicsVertexShaderWidget::Reload(bool replace_vertex_data, void* vertex_d } // Initialize debug info text for current cycle count - cycle_index->setMaximum(debug_data.records.size() - 1); + cycle_index->setMaximum(static_cast<int>(debug_data.records.size() - 1)); OnCycleIndexChanged(cycle_index->value()); model->endResetModel(); diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp index 8734a8efd..2f9beb5cc 100644 --- a/src/citra_qt/util/util.cpp +++ b/src/citra_qt/util/util.cpp @@ -19,7 +19,7 @@ QString ReadableByteSize(qulonglong size) { static const std::array<const char*, 6> units = { "B", "KiB", "MiB", "GiB", "TiB", "PiB" }; if (size == 0) return "0"; - int digit_groups = std::min<int>((int)(std::log10(size) / std::log10(1024)), units.size()); + int digit_groups = std::min<int>(static_cast<int>(std::log10(size) / std::log10(1024)), static_cast<int>(units.size())); return QString("%L1 %2").arg(size / std::pow(1024, digit_groups), 0, 'f', 1) .arg(units[digit_groups]); } |