WinRT/UWP build: fix some specific warnings

mshabunin · mshabunin · commit 52100328d82d · 2024-10-25T22:32:44.000+03:00
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
@@ -916,16 +916,6 @@ macro(ocv_create_module)
                          POST_BUILD
                          COMMAND link.exe /edit /APPCONTAINER:NO $(TargetPath))
     endif()
-
-    if("${the_module}" STREQUAL "opencv_ts")
-      # copy required dll files; WinRT apps need these dlls that are usually substituted by Visual Studio
-      # however they are not on path and need to be placed with executables to run from console w/o APPCONTAINER
-      add_custom_command(TARGET ${the_module}
-        POST_BUILD
-        COMMAND copy /y "\"$(VCInstallDir)redist\\$(PlatformTarget)\\Microsoft.VC$(PlatformToolsetVersion).CRT\\msvcp$(PlatformToolsetVersion).dll\"" "\"${CMAKE_BINARY_DIR}\\bin\\$(Configuration)\\msvcp$(PlatformToolsetVersion)_app.dll\""
-        COMMAND copy /y "\"$(VCInstallDir)redist\\$(PlatformTarget)\\Microsoft.VC$(PlatformToolsetVersion).CRT\\msvcr$(PlatformToolsetVersion).dll\"" "\"${CMAKE_BINARY_DIR}\\bin\\$(Configuration)\\msvcr$(PlatformToolsetVersion)_app.dll\""
-        COMMAND copy /y "\"$(VCInstallDir)redist\\$(PlatformTarget)\\Microsoft.VC$(PlatformToolsetVersion).CRT\\vccorlib$(PlatformToolsetVersion).dll\"" "\"${CMAKE_BINARY_DIR}\\bin\\$(Configuration)\\vccorlib$(PlatformToolsetVersion)_app.dll\"")
-    endif()
   endif()
 endmacro()
 
diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp
@@ -164,9 +164,9 @@ bool getBinLocation(std::string& dst)
 #ifdef _WIN32
 bool getBinLocation(std::wstring& dst)
 {
-    void* addr = (void*)getModuleLocation; // using code address, doesn't work with static linkage!
     HMODULE m = 0;
 #if _WIN32_WINNT >= 0x0501 && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
+    void* addr = (void*)getModuleLocation; // using code address, doesn't work with static linkage!
     ::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
         reinterpret_cast<LPCTSTR>(addr),
         &m);
diff --git a/modules/highgui/src/window_winrt.cpp b/modules/highgui/src/window_winrt.cpp
@@ -41,10 +41,13 @@
     __FILE__, __LINE__ );                       \
 }
 
+#ifdef CV_ERROR
+#undef CV_ERROR
 #define CV_ERROR( Code, Msg )                                       \
 {                                                                   \
     cvError( (Code), cvFuncName, Msg, __FILE__, __LINE__ );         \
 };
+#endif
 
 /********************************** WinRT Specific API Implementation ******************************************/
 
@@ -86,6 +89,7 @@ CV_IMPL void cvShowImage(const char* name, const CvArr* arr)
 
 CV_IMPL int cvNamedWindow(const char* name, int flags)
 {
+    CV_UNUSED(flags);
     CV_FUNCNAME("cvNamedWindow");
 
     if (!name)
@@ -116,8 +120,6 @@ CV_IMPL int cvCreateTrackbar2(const char* trackbar_name, const char* window_name
 {
     CV_FUNCNAME("cvCreateTrackbar2");
 
-    int pos = 0;
-
     if (!window_name || !trackbar_name)
         CV_ERROR(cv::Error::StsNullPtr, "NULL window or trackbar name");
 
@@ -197,7 +199,7 @@ CV_IMPL int cvGetTrackbarPos(const char* trackbar_name, const char* window_name)
     CvTrackbar* trackbar = HighguiBridge::getInstance().findTrackbarByName(trackbar_name, window_name);
 
     if (trackbar)
-        pos = trackbar->getPosition();
+        pos = (int)trackbar->getPosition();
 
     return pos;
 }
@@ -209,11 +211,11 @@ CV_IMPL int cvWaitKey(int delay)
     CV_WINRT_NO_GUI_ERROR("cvWaitKey");
 
     // see https://msdn.microsoft.com/en-us/library/windows/desktop/ms724411(v=vs.85).aspx
-    int time0 = GetTickCount64();
+    //int time0 = GetTickCount64();
 
     for (;;)
     {
-        CvWindow* window;
+        // CvWindow* window;
 
         if (delay <= 0)
         {
@@ -224,6 +226,7 @@ CV_IMPL int cvWaitKey(int delay)
 
 CV_IMPL void cvSetMouseCallback(const char* window_name, CvMouseCallback on_mouse, void* param)
 {
+    CV_UNUSED(on_mouse); CV_UNUSED(param);
     CV_WINRT_NO_GUI_ERROR("cvSetMouseCallback");
 
     CV_FUNCNAME("cvSetMouseCallback");
@@ -242,11 +245,13 @@ CV_IMPL void cvSetMouseCallback(const char* window_name, CvMouseCallback on_mous
 
 CV_IMPL void cvMoveWindow(const char* name, int x, int y)
 {
+    CV_UNUSED(name); CV_UNUSED(x); CV_UNUSED(y);
     CV_WINRT_NO_GUI_ERROR("cvMoveWindow");
 }
 
 CV_IMPL void cvResizeWindow(const char* name, int width, int height)
 {
+    CV_UNUSED(name); CV_UNUSED(width); CV_UNUSED(height);
     CV_WINRT_NO_GUI_ERROR("cvResizeWindow");
 }
 
@@ -269,10 +274,12 @@ CV_IMPL const char* cvGetWindowName(void*)
 }
 
 void cvSetModeWindow_WinRT(const char* name, double prop_value) {
+    CV_UNUSED(name); CV_UNUSED(prop_value);
     CV_WINRT_NO_GUI_ERROR("cvSetModeWindow");
 }
 
 double cvGetModeWindow_WinRT(const char* name) {
+    CV_UNUSED(name);
     CV_WINRT_NO_GUI_ERROR("cvGetModeWindow");
     return cv::Error::StsNotImplemented;
 }
diff --git a/modules/highgui/src/window_winrt_bridge.cpp b/modules/highgui/src/window_winrt_bridge.cpp
@@ -64,9 +64,9 @@ HighguiBridge& HighguiBridge::getInstance()
     return instance;
 }
 
-void HighguiBridge::setContainer(Windows::UI::Xaml::Controls::Panel^ container)
+void HighguiBridge::setContainer(Windows::UI::Xaml::Controls::Panel^ container_)
 {
-    this->container = container;
+    this->container = container_;
 }
 
 CvWindow* HighguiBridge::findWindowByName(cv::String name)
@@ -190,9 +190,9 @@ void CvTrackbar::setMinPosition(double pos)
     slider->Minimum = pos;
 }
 
-void CvTrackbar::setSlider(Slider^ slider) {
-    if (slider)
-        this->slider = slider;
+void CvTrackbar::setSlider(Slider^ slider_) {
+    if (slider_)
+        this->slider = slider_;
 }
 
 double CvTrackbar::getPosition()
@@ -219,6 +219,7 @@ Slider^ CvTrackbar::getSlider()
 
 CvWindow::CvWindow(cv::String name, int flags) : name(name)
 {
+    CV_UNUSED(flags);
     this->page = (Page^)Windows::UI::Xaml::Markup::XamlReader::Load(const_cast<Platform::String^>(markupContent));
     this->sliderMap = new std::map<cv::String, CvTrackbar*>();
 
@@ -246,14 +247,15 @@ CvWindow::CvWindow(cv::String name, int flags) : name(name)
 
 CvWindow::~CvWindow() {}
 
-void CvWindow::createSlider(cv::String name, int* val, int count, CvTrackbarCallback2 on_notify, void* userdata)
+void CvWindow::createSlider(cv::String name_, int* val, int count, CvTrackbarCallback2 on_notify, void* userdata)
 {
-    CvTrackbar* trackbar = findTrackbarByName(name);
+    CV_UNUSED(userdata);
+    CvTrackbar* trackbar = findTrackbarByName(name_);
 
     // Creating slider if name is new or reusing the existing one
     Slider^ slider = !trackbar ? ref new Slider() : trackbar->getSlider();
 
-    slider->Header = HighguiBridge::getInstance().convertString(name);
+    slider->Header = HighguiBridge::getInstance().convertString(name_);
 
     // Making slider the same size as the image control or setting minimal size.
     // This is added to cover potential edge cases because:
@@ -282,26 +284,26 @@ void CvWindow::createSlider(cv::String name, int* val, int count, CvTrackbarCall
         if (!sliderPanel) return;
 
         // Adding slider to the list for current window
-        CvTrackbar* trackbar = new CvTrackbar(name, slider, this);
-        trackbar->callback = on_notify;
+        CvTrackbar* trackbar_ = new CvTrackbar(name_, slider, this);
+        trackbar_->callback = on_notify;
         slider->ValueChanged +=
             ref new Controls::Primitives::RangeBaseValueChangedEventHandler(
             [=](Platform::Object^ sender,
                 Windows::UI::Xaml::Controls::Primitives::RangeBaseValueChangedEventArgs^ e)
             {
                 Slider^ slider = (Slider^)sender;
-                trackbar->callback(slider->Value, nullptr);
+                trackbar_->callback((int)slider->Value, nullptr);
             });
-        this->sliderMap->insert(std::pair<cv::String, CvTrackbar*>(name, trackbar));
+        this->sliderMap->insert(std::pair<cv::String, CvTrackbar*>(name_, trackbar_));
 
         // Adding slider to the window
         sliderPanel->Children->Append(slider);
     }
 }
 
-CvTrackbar* CvWindow::findTrackbarByName(cv::String name)
+CvTrackbar* CvWindow::findTrackbarByName(cv::String name_)
 {
-    auto search = sliderMap->find(name);
+    auto search = sliderMap->find(name_);
     if (search != sliderMap->end()) {
         return search->second;
     }
@@ -342,12 +344,12 @@ Page^ CvWindow::getPage()
 }
 
 //TODO: prototype, not in use yet
-void CvWindow::createButton(cv::String name)
+void CvWindow::createButton(cv::String name_)
 {
     if (!buttonPanel) return;
 
     Button^ b = ref new Button();
-    b->Content = HighguiBridge::getInstance().convertString(name);
+    b->Content = HighguiBridge::getInstance().convertString(name_);
     b->Width = 260;
     b->Height = 80;
     b->Click += ref new Windows::UI::Xaml::RoutedEventHandler(
@@ -361,4 +363,4 @@ void CvWindow::createButton(cv::String name)
     buttonPanel->Children->Append(b);
 }
 
-// end
+// end
diff --git a/modules/highgui/src/window_winrt_bridge.hpp b/modules/highgui/src/window_winrt_bridge.hpp
@@ -113,7 +113,6 @@ class HighguiBridge
 
     // Meyers singleton
     HighguiBridge(const HighguiBridge &);
-    void operator=(HighguiBridge &);
     HighguiBridge() {
         windowsMap = new std::map<cv::String, CvWindow*>();
     };
@@ -232,4 +231,4 @@ class CvWindow
 
     // Default Slider size, fallback solution for unexpected edge cases
     static const double sliderDefaultWidth;
-};
+};
diff --git a/modules/objdetect/src/face_detect.cpp b/modules/objdetect/src/face_detect.cpp
@@ -309,7 +309,7 @@ Ptr<FaceDetectorYN> FaceDetectorYN::create(const String& framework,
 #ifdef HAVE_OPENCV_DNN
     return makePtr<FaceDetectorYNImpl>(framework, bufferModel, bufferConfig, input_size, score_threshold, nms_threshold, top_k, backend_id, target_id);
 #else
-    CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(input_size); CV_UNUSED(score_threshold); CV_UNUSED(nms_threshold); CV_UNUSED(top_k); CV_UNUSED(backend_id); CV_UNUSED(target_id);
+    CV_UNUSED(framework);  CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(input_size); CV_UNUSED(score_threshold); CV_UNUSED(nms_threshold); CV_UNUSED(top_k); CV_UNUSED(backend_id); CV_UNUSED(target_id);
     CV_Error(cv::Error::StsNotImplemented, "cv::FaceDetectorYN requires enabled 'dnn' module.");
 #endif
 }
diff --git a/modules/objdetect/src/face_recognize.cpp b/modules/objdetect/src/face_recognize.cpp
@@ -210,7 +210,7 @@ Ptr<FaceRecognizerSF> FaceRecognizerSF::create(const String& framework,
 #ifdef HAVE_OPENCV_DNN
     return makePtr<FaceRecognizerSFImpl>(framework, bufferModel, bufferConfig, backend_id, target_id);
 #else
-    CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(backend_id); CV_UNUSED(target_id);
+    CV_UNUSED(framework);  CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(backend_id); CV_UNUSED(target_id);
     CV_Error(cv::Error::StsNotImplemented, "cv::FaceRecognizerSF requires enabled 'dnn' module");
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,13 @@`
`41`	`41`	`__FILE__, __LINE__ ); \`
`42`	`42`	`}`
`43`	`43`
	`44`	`+#ifdef CV_ERROR`
	`45`	`+#undef CV_ERROR`
`44`	`46`	`#define CV_ERROR( Code, Msg ) \`
`45`	`47`	`{ \`
`46`	`48`	`cvError( (Code), cvFuncName, Msg, __FILE__, __LINE__ ); \`
`47`	`49`	`};`
	`50`	`+#endif`
`48`	`51`
`49`	`52`	`/******************************** WinRT Specific API Implementation ****************************************/`
`50`	`53`
`@@ -86,6 +89,7 @@ CV_IMPL void cvShowImage(const char* name, const CvArr* arr)`
`86`	`89`
`87`	`90`	`CV_IMPL int cvNamedWindow(const char* name, int flags)`
`88`	`91`	`{`
	`92`	`+ CV_UNUSED(flags);`
`89`	`93`	`CV_FUNCNAME("cvNamedWindow");`
`90`	`94`
`91`	`95`	`if (!name)`
`@@ -116,8 +120,6 @@ CV_IMPL int cvCreateTrackbar2(const char* trackbar_name, const char* window_name`
`116`	`120`	`{`
`117`	`121`	`CV_FUNCNAME("cvCreateTrackbar2");`
`118`	`122`
`119`		`- int pos = 0;`
`120`		`-`
`121`	`123`	`if (!window_name \|\| !trackbar_name)`
`122`	`124`	`CV_ERROR(cv::Error::StsNullPtr, "NULL window or trackbar name");`
`123`	`125`
`@@ -197,7 +199,7 @@ CV_IMPL int cvGetTrackbarPos(const char* trackbar_name, const char* window_name)`
`197`	`199`	`CvTrackbar* trackbar = HighguiBridge::getInstance().findTrackbarByName(trackbar_name, window_name);`
`198`	`200`
`199`	`201`	`if (trackbar)`
`200`		`- pos = trackbar->getPosition();`
	`202`	`+ pos = (int)trackbar->getPosition();`
`201`	`203`
`202`	`204`	`return pos;`
`203`	`205`	`}`
`@@ -209,11 +211,11 @@ CV_IMPL int cvWaitKey(int delay)`
`209`	`211`	`CV_WINRT_NO_GUI_ERROR("cvWaitKey");`
`210`	`212`
`211`	`213`	`// see https://msdn.microsoft.com/en-us/library/windows/desktop/ms724411(v=vs.85).aspx`
`212`		`- int time0 = GetTickCount64();`
	`214`	`+ //int time0 = GetTickCount64();`
`213`	`215`
`214`	`216`	`for (;;)`
`215`	`217`	`{`
`216`		`- CvWindow* window;`
	`218`	`+ // CvWindow* window;`
`217`	`219`
`218`	`220`	`if (delay <= 0)`
`219`	`221`	`{`
`@@ -224,6 +226,7 @@ CV_IMPL int cvWaitKey(int delay)`
`224`	`226`
`225`	`227`	`CV_IMPL void cvSetMouseCallback(const char* window_name, CvMouseCallback on_mouse, void* param)`
`226`	`228`	`{`
	`229`	`+ CV_UNUSED(on_mouse); CV_UNUSED(param);`
`227`	`230`	`CV_WINRT_NO_GUI_ERROR("cvSetMouseCallback");`
`228`	`231`
`229`	`232`	`CV_FUNCNAME("cvSetMouseCallback");`
`@@ -242,11 +245,13 @@ CV_IMPL void cvSetMouseCallback(const char* window_name, CvMouseCallback on_mous`
`242`	`245`
`243`	`246`	`CV_IMPL void cvMoveWindow(const char* name, int x, int y)`
`244`	`247`	`{`
	`248`	`+ CV_UNUSED(name); CV_UNUSED(x); CV_UNUSED(y);`
`245`	`249`	`CV_WINRT_NO_GUI_ERROR("cvMoveWindow");`
`246`	`250`	`}`
`247`	`251`
`248`	`252`	`CV_IMPL void cvResizeWindow(const char* name, int width, int height)`
`249`	`253`	`{`
	`254`	`+ CV_UNUSED(name); CV_UNUSED(width); CV_UNUSED(height);`
`250`	`255`	`CV_WINRT_NO_GUI_ERROR("cvResizeWindow");`
`251`	`256`	`}`
`252`	`257`
`@@ -269,10 +274,12 @@ CV_IMPL const char* cvGetWindowName(void*)`
`269`	`274`	`}`
`270`	`275`
`271`	`276`	`void cvSetModeWindow_WinRT(const char* name, double prop_value) {`
	`277`	`+ CV_UNUSED(name); CV_UNUSED(prop_value);`
`272`	`278`	`CV_WINRT_NO_GUI_ERROR("cvSetModeWindow");`
`273`	`279`	`}`
`274`	`280`
`275`	`281`	`double cvGetModeWindow_WinRT(const char* name) {`
	`282`	`+ CV_UNUSED(name);`
`276`	`283`	`CV_WINRT_NO_GUI_ERROR("cvGetModeWindow");`
`277`	`284`	`return cv::Error::StsNotImplemented;`
`278`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ Ptr<FaceDetectorYN> FaceDetectorYN::create(const String& framework,`
`309`	`309`	`#ifdef HAVE_OPENCV_DNN`
`310`	`310`	`return makePtr<FaceDetectorYNImpl>(framework, bufferModel, bufferConfig, input_size, score_threshold, nms_threshold, top_k, backend_id, target_id);`
`311`	`311`	`#else`
`312`		`- CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(input_size); CV_UNUSED(score_threshold); CV_UNUSED(nms_threshold); CV_UNUSED(top_k); CV_UNUSED(backend_id); CV_UNUSED(target_id);`
	`312`	`+ CV_UNUSED(framework); CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(input_size); CV_UNUSED(score_threshold); CV_UNUSED(nms_threshold); CV_UNUSED(top_k); CV_UNUSED(backend_id); CV_UNUSED(target_id);`
`313`	`313`	`CV_Error(cv::Error::StsNotImplemented, "cv::FaceDetectorYN requires enabled 'dnn' module.");`
`314`	`314`	`#endif`
`315`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ Ptr<FaceRecognizerSF> FaceRecognizerSF::create(const String& framework,`
`210`	`210`	`#ifdef HAVE_OPENCV_DNN`
`211`	`211`	`return makePtr<FaceRecognizerSFImpl>(framework, bufferModel, bufferConfig, backend_id, target_id);`
`212`	`212`	`#else`
`213`		`- CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(backend_id); CV_UNUSED(target_id);`
	`213`	`+ CV_UNUSED(framework); CV_UNUSED(bufferModel); CV_UNUSED(bufferConfig); CV_UNUSED(backend_id); CV_UNUSED(target_id);`
`214`	`214`	`CV_Error(cv::Error::StsNotImplemented, "cv::FaceRecognizerSF requires enabled 'dnn' module");`
`215`	`215`	`#endif`
`216`	`216`	`}`