PokemonAutomation · pifopi · Jun 18, 2025 · Jun 18, 2025
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/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -2449,7 +2449,7 @@ if (MSVC)
         PA_DPP
     )
 
-    target_compile_options(SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /utf-8)
+    target_compile_options(SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /external:anglebrackets /external:W0 /utf-8)
     target_compile_options(SerialPrograms PRIVATE /wd5054)  # Deprecated enum arithemtic
     target_compile_options(SerialPrograms PRIVATE /wd4505)  # unreferenced local function has been removed
 

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([[maybe_unused]] const JsonValue& json){}
     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([[maybe_unused]] void* object){
 //    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,7 +1,6 @@
 #ifdef PA_DPP
 
 #include <set>
-#include <dpp/DPP_SilenceWarnings.h>
 #include <dpp/dpp.h>
 #include <Integrations/DppIntegration/DppClient.h>
 #include <Integrations/DppIntegration/DppCommandHandler.h>

diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp
@@ -1,7 +1,6 @@
 #ifdef PA_DPP
 
 #include <format>
-#include <dpp/DPP_SilenceWarnings.h>
 #include <dpp/dpp.h>
 #include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
 #include "CommonFramework/Globals.h"

diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp
@@ -1,6 +1,5 @@
 #ifdef PA_DPP
 
-#include <dpp/DPP_SilenceWarnings.h>
 #include <dpp/dpp.h>
 #include <Integrations/DppIntegration/DppUtility.h>
 #include "CommonFramework/GlobalSettingsPanel.h"

diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp
@@ -251,7 +251,7 @@ void LabelImages::load_image_related_data(const std::string& image_path, size_t
         return; // no embedding, then no way for us to annotate
     }
     // see if we can load the previously created labels
-    const std::string anno_filename = std::filesystem::path(image_path).filename().replace_extension(".json");
+    const std::string anno_filename = std::filesystem::path(image_path).filename().replace_extension(".json").string();
 
     // ensure the folder exists
     std::filesystem::create_directory(ML_ANNOTATION_PATH());
@@ -284,7 +284,7 @@ void LabelImages::load_image_related_data(const std::string& image_path, size_t
         try{
             ObjectAnnotation anno_obj = json_to_object_annotation((*json_array)[i]);
             m_annotated_objects.emplace_back(std::move(anno_obj));
-        } catch(JsonParseException & e){
+        } catch([[maybe_unused]] JsonParseException & e){
             m_fail_to_load_annotation_file = true;
             QMessageBox box;
             box.warning(nullptr, "Unable to Load Annotation",

diff --git a/vcpkg b/vcpkg