Rework warning supression

pifopi · pifopi · commit dcba78b219cf · 2025-06-17T19:01:42.000+02:00
diff --git a/3rdParty/DPP_PushWarnings.inl b/3rdParty/DPP_PushWarnings.inl
@@ -0,0 +1,9 @@
+#if 0
+#elif _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4100) /* Unreferenced Formal Parameter */
+#pragma warning(disable:4251) /* dll-interface */
+#elif __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
diff --git a/3rdParty/OpenCV_PushWarnings.inl b/3rdParty/OpenCV_PushWarnings.inl
@@ -0,0 +1,7 @@
+#if 0
+#elif _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4127) /* conditional expression is constant  */
+#elif __GNUC__
+#pragma GCC diagnostic push
+#endif
diff --git a/3rdParty/PopWarnings.inl b/3rdParty/PopWarnings.inl
@@ -0,0 +1,6 @@
+#if 0
+#elif _MSC_VER
+#pragma warning(pop)
+#elif __GNUC__
+#pragma GCC diagnostic pop
+#endif
diff --git a/3rdParty/dpp/DPP_SilenceWarnings.h b/3rdParty/dpp/DPP_SilenceWarnings.h
diff --git a/3rdParty/opencv-4.11.0/opencv2/core/types.hpp b/3rdParty/opencv-4.11.0/opencv2/core/types.hpp
@@ -1851,10 +1851,8 @@ template<typename _Tp> inline
 _Tp Rect_<_Tp>::area() const
 {
     const _Tp result = width * height;
-    if constexpr (std::numeric_limits<_Tp>::is_integer)
-    {
-        CV_DbgAssert(width == 0 || result / width == height); // make sure the result fits in the return value
-    }
+    CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer
+        || width == 0 || result / width == height); // make sure the result fits in the return value
     return result;
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
@@ -5,7 +5,9 @@
  */
 
 #include <QImage>
+#include "OpenCV_PushWarnings.inl"
 #include <opencv2/core/mat.hpp>
+#include "PopWarnings.inl"
 #include "Common/Cpp/Exceptions.h"
 #include "ImageRGB32.h"
 #include "ImageViewRGB32.h"
diff --git a/SerialPrograms/Source/CommonFramework/Main.cpp b/SerialPrograms/Source/CommonFramework/Main.cpp
@@ -4,7 +4,6 @@
 #include <QFileInfo>
 //#include <QTextStream>
 #include <QMessageBox>
-#include <dpp/DPP_SilenceWarnings.h>
 #include <Integrations/DppIntegration/DppClient.h>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/ImageResolution.h"
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <QFile>
-#include <dpp/DPP_SilenceWarnings.h>
 #include <Integrations/DppIntegration/DppClient.h>
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Json/JsonValue.h"
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h b/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h
@@ -38,7 +38,7 @@ class PanelInstance{
 public:
     //  Serialization
     void from_json();
-    virtual void from_json(const JsonValue& json){}
+    virtual void from_json(const JsonValue&){}
     virtual JsonValue to_json() const;
 
 protected:
diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp
@@ -7,7 +7,6 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <dpp/DPP_SilenceWarnings.h>
 #include "Common/Qt/StringToolsQt.h"
 //#include "CommonFramework/Globals.h"
 //#include "CommonFramework/GlobalSettingsPanel.h"
@@ -122,7 +121,7 @@ DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption()
     this->add_listener(*this);
     library0.add_listener(*this);
 }
-void DiscordIntegrationSettingsOption::on_config_value_changed(void* object){
+void DiscordIntegrationSettingsOption::on_config_value_changed(void*){
 //    cout << this->enabled() << endl;
 #if (defined PA_SLEEPY || defined PA_DPP)
     bool options_enabled = this->enabled();
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp
@@ -1,8 +1,9 @@
 #ifdef PA_DPP
 
 #include <set>
-#include <dpp/DPP_SilenceWarnings.h>
+#include "DPP_PushWarnings.inl"
 #include <dpp/dpp.h>
+#include "PopWarnings.inl"
 #include <Integrations/DppIntegration/DppClient.h>
 #include <Integrations/DppIntegration/DppCommandHandler.h>
 #include "Common/Cpp/Json/JsonArray.h"
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h
@@ -3,7 +3,9 @@
 #define DPP_CLIENT_H
 
 #include <atomic>
+#include "DPP_PushWarnings.inl"
 #include <dpp/dpp.h>
+#include "PopWarnings.inl"
 #include <Integrations/DppIntegration/DppCommandHandler.h>
 #include "CommonFramework/Notifications/MessageAttachment.h"
 
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp
@@ -1,8 +1,9 @@
 #ifdef PA_DPP
 
 #include <format>
-#include <dpp/DPP_SilenceWarnings.h>
+#include "DPP_PushWarnings.inl"
 #include <dpp/dpp.h>
+#include "PopWarnings.inl"
 #include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
 #include "CommonFramework/Globals.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.h b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.h
@@ -2,7 +2,9 @@
 #ifndef DPP_HANDLER_H
 #define DPP_HANDLER_H
 
+#include "DPP_PushWarnings.inl"
 #include <dpp/dpp.h>
+#include "PopWarnings.inl"
 #include <Integrations/DppIntegration/DppUtility.h>
 #include "CommonFramework/Notifications/MessageAttachment.h"
 #include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp
@@ -1,7 +1,8 @@
 #ifdef PA_DPP
 
-#include <dpp/DPP_SilenceWarnings.h>
+#include "DPP_PushWarnings.inl"
 #include <dpp/dpp.h>
+#include "PopWarnings.inl"
 #include <Integrations/DppIntegration/DppUtility.h>
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Logging/Logger.h"
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.h b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.h
@@ -2,7 +2,9 @@
 #ifndef DPP_UTILITY_H
 #define DPP_UTILITY_H
 
+#include "DPP_PushWarnings.inl"
 #include <dpp/dpp.h>
+#include "PopWarnings.inl"
 #include <atomic>
 #include "Common/Cpp/AbstractLogger.h"
 
diff --git a/SerialPrograms/Source/ML/DataLabeling/SegmentAnythingModel.cpp b/SerialPrograms/Source/ML/DataLabeling/SegmentAnythingModel.cpp
@@ -8,7 +8,9 @@
 #include <fstream>
 #include <iostream>
 #include <onnxruntime_cxx_api.h>
+#include "OpenCV_PushWarnings.inl"
 #include <opencv2/imgcodecs.hpp>
+#include "PopWarnings.inl"
 #include "3rdParty/ONNX/OnnxToolsPA.h"
 #include "SegmentAnythingModel.h"
 
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
@@ -3,8 +3,9 @@
  *  From: https://github.com/PokemonAutomation/
  *
  */
-
+#include <OpenCV_PushWarnings.inl>
 #include <opencv2/imgproc.hpp>
+#include <PopWarnings.inl>
 #include "Common/Cpp/AbstractLogger.h"
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
@@ -4,7 +4,9 @@
  *
  */
 
+#include <OpenCV_PushWarnings.inl>
 #include <opencv2/imgproc.hpp>
+#include <PopWarnings.inl>
 #include "CommonFramework/Logging/Logger.h"
 #include "CommonTools/Images/ImageFilter.h"
 #include "CommonTools/ImageMatch/ImageCropper.h"
diff --git a/vcpkg b/vcpkg
@@ -0,0 +1 @@
+Subproject commit ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0

Original file line number	Diff line number	Diff line change
`@@ -1851,10 +1851,8 @@ template<typename _Tp> inline`
`1851`	`1851`	`_Tp Rect_<_Tp>::area() const`
`1852`	`1852`	`{`
`1853`	`1853`	`const _Tp result = width * height;`
`1854`		`- if constexpr (std::numeric_limits<_Tp>::is_integer)`
`1855`		`- {`
`1856`		`- CV_DbgAssert(width == 0 \|\| result / width == height); // make sure the result fits in the return value`
`1857`		`- }`
	`1854`	`+ CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer`
	`1855`	`+ \|\| width == 0 \|\| result / width == height); // make sure the result fits in the return value`
`1858`	`1856`	`return result;`
`1859`	`1857`	`}`
`1860`	`1858`