From a55f83a38f7343de33a50c60fea5ff8d8492607a Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Thu, 10 Oct 2019 00:24:55 -0500 Subject: [PATCH] UI, libobs: Fix compiler warnings --- UI/window-basic-preview.cpp | 8 +++++--- libobs/obs.c | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/UI/window-basic-preview.cpp b/UI/window-basic-preview.cpp index ebda31a19..cc444c2ae 100644 --- a/UI/window-basic-preview.cpp +++ b/UI/window-basic-preview.cpp @@ -650,13 +650,15 @@ void OBSBasicPreview::mouseReleaseEvent(QMouseEvent *event) std::lock_guard lock(selectMutex); if (altDown || ctrlDown || shiftDown) { - for (int i = 0; i < selectedItems.size(); i++) { + for (size_t i = 0; i < selectedItems.size(); + i++) { obs_sceneitem_select(selectedItems[i], true); } } - for (int i = 0; i < hoveredPreviewItems.size(); i++) { + for (size_t i = 0; i < hoveredPreviewItems.size(); + i++) { bool select = true; obs_sceneitem_t *item = hoveredPreviewItems[i]; @@ -1677,7 +1679,7 @@ bool OBSBasicPreview::DrawSelectedItem(obs_scene_t *scene, bool hovered = false; { std::lock_guard lock(prev->selectMutex); - for (int i = 0; i < prev->hoveredPreviewItems.size(); i++) { + for (size_t i = 0; i < prev->hoveredPreviewItems.size(); i++) { if (prev->hoveredPreviewItems[i] == item) { hovered = true; break; diff --git a/libobs/obs.c b/libobs/obs.c index 5c2db4c3e..9ea3a8ac5 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -139,6 +139,8 @@ static bool obs_init_gpu_conversion(struct obs_video_info *ovi) if (!video->convert_textures[2]) return false; break; + default: + break; } #ifdef _WIN32 } @@ -190,6 +192,8 @@ static bool obs_init_gpu_copy_surfaces(struct obs_video_info *ovi, size_t i) if (!video->copy_surfaces[i][2]) return false; break; + default: + break; } return true;