Handle MSVC warnings

IntelRealSense · Apr 8, 2021 · 5c6ad4c · 5c6ad4c
1 parent f7960ff
commit 5c6ad4c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/common/model-views.cpp b/common/model-views.cpp
@@ -5866,7 +5866,7 @@ namespace rs2
                                     model.add_log(to_string() << "Setting " << opt_model.opt << " to "
                                         << new_val << " (" << labels[selected] << ")");
 
-                                    opt_model.set_option(opt_model.opt, new_val, error_message);
+                                    opt_model.set_option(opt_model.opt, static_cast<float>(new_val), error_message);
 
                                     // Only apply preset to GUI if set_option was succesful
                                     selected_file_preset = "";

diff --git a/common/output-model.cpp b/common/output-model.cpp
@@ -156,7 +156,7 @@ void output_model::open(ux_window& win)
 {
     is_output_open = true;
     config_file::instance().set(configurations::viewer::output_open, true);
-    default_log_h = (int)((win.height() - 100) / 2);
+    default_log_h = static_cast<int>((win.height() - 100) / 2);
     new_log = true;
 }
 

diff --git a/common/viewer.cpp b/common/viewer.cpp
@@ -274,7 +274,7 @@ namespace rs2
 
                         for (auto& option : curr_exporter->second.options)
                         {
-                            exporter->set_option(option.first, option.second);
+                            exporter->set_option(option.first, static_cast<float>(option.second));
                         }
 
                         export_frame(fname, std::move(exporter), *not_model, data);

diff --git a/src/gl/yuy2rgb-gl.cpp b/src/gl/yuy2rgb-gl.cpp
@@ -11,7 +11,7 @@
 
 #ifndef NOMINMAX
 #define NOMINMAX
-#endif
+#endif // NOMINMAX
 
 #include <glad/glad.h>
 

diff --git a/tools/realsense-viewer/realsense-viewer.cpp b/tools/realsense-viewer/realsense-viewer.cpp
@@ -628,7 +628,7 @@ int main(int argc, const char** argv) try
 
         auto output_rect = rect{ viewer_model.panel_width,
             window.height() - viewer_model.get_output_height(),
-            window.width() - viewer_model.panel_width, viewer_model.get_output_height() };
+            window.width() - viewer_model.panel_width, float(viewer_model.get_output_height()) };
 
         viewer_model.not_model->output.draw(window, output_rect, *device_models);