Merge pull request #2911 from Wovchena/demos/cpp-fix-warnings

demos/cpp: fix warnings

Author: Wovchena

demos/common/cpp/monitors/src/cpu_monitor.cpp

@@ -9,8 +9,8 @@
 #include "query_wrapper.h"
 #include <string>
 #include <system_error>
-#include <pdhmsg.h>
-#include <windows.h>
+#include <PdhMsg.h>
+#include <Windows.h>
 
 namespace {
 const std::size_t nCores = []() {
@@ -168,7 +168,7 @@ void CpuMonitor::setHistorySize(std::size_t size) {
         performanceCounter.reset();
     }
     historySize = size;
-    std::size_t newSize = std::min(size, cpuLoadHistory.size());
+    std::ptrdiff_t newSize = static_cast<std::ptrdiff_t>(std::min(size, cpuLoadHistory.size()));
     cpuLoadHistory.erase(cpuLoadHistory.begin(), cpuLoadHistory.end() - newSize);
 }
 

demos/common/cpp/monitors/src/memory_monitor.cpp

@@ -13,9 +13,9 @@ struct MemState {
 #include <algorithm>
 #define PSAPI_VERSION 2
 #include <system_error>
-#include <windows.h>
-#include <pdhmsg.h>
-#include <psapi.h>
+#include <Windows.h>
+#include <PdhMsg.h>
+#include <Psapi.h>
 
 namespace {
 double getMemTotal() {

demos/common/cpp/monitors/src/query_wrapper.cpp

@@ -4,7 +4,7 @@
 
 #include "query_wrapper.h"
 
-#include <windows.h>
+#include <Windows.h>
 #include <system_error>
 
 QueryWrapper::QueryWrapper() {

demos/common/cpp/monitors/src/query_wrapper.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <pdh.h>
+#include <Pdh.h>
 class QueryWrapper {
 public:
     QueryWrapper();

demos/common/cpp/utils/src/images_capture.cpp

@@ -183,13 +183,12 @@ class VideoCapWrapper : public ImagesCapture {
 class CameraCapWrapper : public ImagesCapture {
     cv::VideoCapture cap;
     size_t nextImgId;
-    const double initialImageId;
     size_t readLengthLimit;
 
 public:
-    CameraCapWrapper(const std::string &input, bool loop, size_t initialImageId, size_t readLengthLimit,
+    CameraCapWrapper(const std::string &input, bool loop, size_t readLengthLimit,
                 cv::Size cameraResolution)
-            : ImagesCapture{loop}, nextImgId{0}, initialImageId{static_cast<double>(initialImageId)} {
+            : ImagesCapture{loop}, nextImgId{0} {
 
         try {
             if (cap.open(std::stoi(input))) {
@@ -244,7 +243,7 @@ std::unique_ptr<ImagesCapture> openImagesCapture(const std::string &input, bool
     catch (const InvalidInput& e) { invalidInputs.push_back(e.what()); }
     catch (const OpenError& e) { openErrors.push_back(e.what()); }
 
-    try { return std::unique_ptr<ImagesCapture>(new CameraCapWrapper{input, loop, initialImageId, readLengthLimit, cameraResolution}); }
+    try { return std::unique_ptr<ImagesCapture>(new CameraCapWrapper{input, loop, readLengthLimit, cameraResolution}); }
     catch (const InvalidInput& e) { invalidInputs.push_back(e.what()); }
     catch (const OpenError& e) { openErrors.push_back(e.what()); }
 

demos/common/cpp/utils/src/w_dirent.hpp

@@ -10,8 +10,8 @@
 # define NOMINMAX
 #endif
 
-#include <winsock2.h>
-#include <windows.h>
+#include <WinSock2.h>
+#include <Windows.h>
 #include <stdlib.h>
 
 #else