From a9ffc18c094555af3939b7aa39d56fee5246e570 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 1 Aug 2022 20:16:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=20disable=20cv=20warning?= =?UTF-8?q?=20=E7=9A=84=E5=AE=8F=E9=A2=9D=E5=A4=96=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E5=B1=82=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AbstractImageAnalyzer.cpp | 2 + src/MeoAssistant/AbstractImageAnalyzer.h | 6 +- src/MeoAssistant/AbstractTask.cpp | 7 +- src/MeoAssistant/AsstBattleDef.h | 5 +- src/MeoAssistant/{Config.hpp => AsstConf.h} | 0 src/MeoAssistant/AsstInfrastDef.h | 5 +- src/MeoAssistant/BattleImageAnalyzer.cpp | 2 + src/MeoAssistant/BattleProcessTask.cpp | 74 ++++++++++--------- src/MeoAssistant/Controller.cpp | 5 +- src/MeoAssistant/Controller.h | 5 +- src/MeoAssistant/CreditShopImageAnalyzer.cpp | 3 +- src/MeoAssistant/DebugTask.cpp | 2 + src/MeoAssistant/DepotImageAnalyzer.cpp | 2 + src/MeoAssistant/HashImageAnalyzer.cpp | 2 + .../InfrastClueVacancyImageAnalyzer.cpp | 2 + .../InfrastFacilityImageAnalyzer.cpp | 2 + src/MeoAssistant/InfrastOperImageAnalyzer.cpp | 2 + .../InfrastSmileyImageAnalyzer.cpp | 2 + src/MeoAssistant/MatchImageAnalyzer.cpp | 2 + src/MeoAssistant/MeoAssistant.vcxproj | 4 +- src/MeoAssistant/MeoAssistant.vcxproj.filters | 8 +- src/MeoAssistant/MultiMatchImageAnalyzer.cpp | 2 + src/MeoAssistant/NoWarningCV.h | 7 ++ src/MeoAssistant/NoWarningCVMat.h | 7 ++ src/MeoAssistant/OcrPack.cpp | 5 +- .../OcrWithPreprocessImageAnalyzer.cpp | 2 + .../RoguelikeBattleTaskPlugin.cpp | 2 + src/MeoAssistant/RoguelikeBattleTaskPlugin.h | 2 + .../RoguelikeFormationImageAnalyzer.cpp | 2 + .../RoguelikeSkillSelectionImageAnalyzer.cpp | 2 + src/MeoAssistant/StageDropsImageAnalyzer.cpp | 2 + src/MeoAssistant/TemplResource.cpp | 2 + src/MeoAssistant/TemplResource.h | 5 +- src/MeoAssistant/TilePack.cpp | 2 +- 34 files changed, 113 insertions(+), 71 deletions(-) rename src/MeoAssistant/{Config.hpp => AsstConf.h} (100%) create mode 100644 src/MeoAssistant/NoWarningCV.h create mode 100644 src/MeoAssistant/NoWarningCVMat.h diff --git a/src/MeoAssistant/AbstractImageAnalyzer.cpp b/src/MeoAssistant/AbstractImageAnalyzer.cpp index 06bd686dbd..7b38d5924e 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/AbstractImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "AbstractImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Controller.h" #include "Logger.hpp" diff --git a/src/MeoAssistant/AbstractImageAnalyzer.h b/src/MeoAssistant/AbstractImageAnalyzer.h index 090976b078..289b4cfe98 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/AbstractImageAnalyzer.h @@ -1,10 +1,6 @@ #pragma once -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END - +#include "NoWarningCVMat.h" #include "AsstTypes.h" //#ifndef ASST_DEBUG diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index 5c11b6af33..e184314fbf 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -4,13 +4,10 @@ #include #include #include - -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END #include +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Controller.h" #include "Logger.hpp" diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/AsstBattleDef.h index 2ccad739d7..fa8a0ff4d2 100644 --- a/src/MeoAssistant/AsstBattleDef.h +++ b/src/MeoAssistant/AsstBattleDef.h @@ -4,10 +4,7 @@ #include #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" #include "AsstTypes.h" diff --git a/src/MeoAssistant/Config.hpp b/src/MeoAssistant/AsstConf.h similarity index 100% rename from src/MeoAssistant/Config.hpp rename to src/MeoAssistant/AsstConf.h diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index 94d1fcc8c5..00d7051966 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -1,9 +1,6 @@ #pragma once -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" #include "AsstTypes.h" diff --git a/src/MeoAssistant/BattleImageAnalyzer.cpp b/src/MeoAssistant/BattleImageAnalyzer.cpp index f9829c14f7..03742c4f08 100644 --- a/src/MeoAssistant/BattleImageAnalyzer.cpp +++ b/src/MeoAssistant/BattleImageAnalyzer.cpp @@ -2,6 +2,8 @@ #include +#include "NoWarningCV.h" + #include "MultiMatchImageAnalyzer.h" #include "MatchImageAnalyzer.h" #include "OcrWithFlagTemplImageAnalyzer.h" diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp index c437b32814..72a3859a23 100644 --- a/src/MeoAssistant/BattleProcessTask.cpp +++ b/src/MeoAssistant/BattleProcessTask.cpp @@ -4,6 +4,8 @@ #include #include +#include "NoWarningCV.h" + #include "Controller.h" #include "Resource.h" #include "TaskData.h" @@ -480,7 +482,7 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action) Rect placed_rect{ placed_point.x ,placed_point.y, 0, 0 }; int dist = static_cast(Point::distance( - placed_point, {oper_rect.x + oper_rect.width / 2, oper_rect.y + oper_rect.height / 2})); + placed_point, { oper_rect.x + oper_rect.width / 2, oper_rect.y + oper_rect.height / 2 })); // 1000 是随便取的一个系数，把整数的 pre_delay 转成小数用的 int duration = static_cast(swipe_oper_task_ptr->pre_delay / 1000.0 * dist * log10(dist)); m_ctrler->swipe(oper_rect, placed_rect, duration, true, 0); @@ -637,12 +639,12 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( { /* * * dlx 算法简介 - * + * * https://oi-wiki.org/search/dlx/ * - * + * * * dlx 算法作用 - * + * * 在形如: * a: 10010 * b: 01110 @@ -659,33 +661,33 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( * * * * dlx 算法建模 - * + * * dlx 的列分为 [组号] [干员号] 两部分 * dlx 的行分为 [可能的选择对] [不选择该干员] 两部分 - * + * * [可能的选择对]: * 每行对应一种可能的选择, * 将组号，干员号对应位置的列设为1 - * + * * [不选择该干员]: * 每行对应不选择某干员的情况, * 将干员号对应位置的列设为1 * * * * dlx 建模示例 - * + * * 有以下分组: * a: {1, 3, 4} * b: {2, 3, 5} * c: {1, 2, 3} * 拥有的干员: * {1, 2, 4, 5, 6} - * + * * 先处理出所有可能的情况: * a: {1, 4} * b: {2, 5} * c: {1, 2} - * + * * 构造表: * abc 1245 * 1 100 1000 @@ -698,20 +700,20 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( * 9 000 0100 ~2 * 9 000 0010 ~4 * A 000 0001 ~5 - * + * * 使用dlx求得一组解: * 一个可能的结果是: * 行号 {2, 3, 5, A} * 即 {, , , ~5} - * + * * 输出分组结果: * a: 4 * b: 2 * c: 1 - * + * */ - // dlx 算法模板类 + // dlx 算法模板类 class DancingLinksModel { private: @@ -721,7 +723,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( std::vector left, right, up, down; std::vector column, row; - void remove(const size_t &column_id) { + void remove(const size_t& column_id) + { left[right[column_id]] = left[column_id]; right[left[column_id]] = right[column_id]; for (size_t i = down[column_id]; i != column_id; i = down[i]) { @@ -733,7 +736,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( } } - void recover(const size_t &column_id) { + void recover(const size_t& column_id) + { for (size_t i = up[column_id]; i != column_id; i = up[i]) { for (size_t j = left[i]; j != i; j = left[j]) { up[down[j]] = down[up[j]] = j; @@ -748,19 +752,20 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( size_t answer_stack_size{}; std::vector answer_stack; - DancingLinksModel(const size_t &max_node_num, const size_t &max_ans_size) : - first(max_node_num), - size(max_node_num), - left(max_node_num), - right(max_node_num), - up(max_node_num), - down(max_node_num), - column(max_node_num), - row(max_node_num), - answer_stack(max_ans_size) { - } + DancingLinksModel(const size_t& max_node_num, const size_t& max_ans_size) : + first(max_node_num), + size(max_node_num), + left(max_node_num), + right(max_node_num), + up(max_node_num), + down(max_node_num), + column(max_node_num), + row(max_node_num), + answer_stack(max_ans_size) + {} - void build(const size_t &column_id) { + void build(const size_t& column_id) + { for (size_t i = 0; i <= column_id; i++) { left[i] = i - 1; right[i] = i + 1; @@ -773,7 +778,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( size.clear(); } - void insert(const size_t &row_id, const size_t &column_id) { + void insert(const size_t& row_id, const size_t& column_id) + { column[++index] = column_id; row[index] = row_id; ++size[column_id]; @@ -783,7 +789,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( down[column_id] = index; if (!first[row_id]) { first[row_id] = left[index] = right[index] = index; - } else { + } + else { right[index] = right[first[row_id]]; left[right[first[row_id]]] = index; left[index] = first[row_id]; @@ -791,7 +798,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( } } - bool dance(const size_t &depth) { + bool dance(const size_t& depth) + { if (!right[0]) { answer_stack_size = depth; return true; @@ -828,10 +836,10 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( std::unordered_map char_name_mapping; std::set char_set(char_list.begin(), char_list.end()); - for (auto &i: group_list) { + for (auto& i : group_list) { group_name_mapping[i.first] = group_id_mapping.size(); group_id_mapping.emplace_back(i.first); - for (auto &j: i.second) { + for (auto& j : i.second) { if (char_set.contains(j)) { node_id_mapping.emplace_back(i.first, j); if (!char_name_mapping.contains(j)) { diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 9987408b7a..aa1c488bc3 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -16,10 +16,7 @@ #include #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCV.h" #ifdef _MSC_VER #pragma warning( push ) diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index 445317a7fa..4dac827047 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -15,10 +15,7 @@ #include #endif -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" #include "AsstTypes.h" #include "AsstMsg.h" diff --git a/src/MeoAssistant/CreditShopImageAnalyzer.cpp b/src/MeoAssistant/CreditShopImageAnalyzer.cpp index bf952bfa26..124a632436 100644 --- a/src/MeoAssistant/CreditShopImageAnalyzer.cpp +++ b/src/MeoAssistant/CreditShopImageAnalyzer.cpp @@ -1,10 +1,11 @@ #include "CreditShopImageAnalyzer.h" +#include "NoWarningCV.h" + #include "MatchImageAnalyzer.h" #include "MultiMatchImageAnalyzer.h" #include "OcrImageAnalyzer.h" #include "Resource.h" - #include "AsstUtils.hpp" void asst::CreditShopImageAnalyzer::set_black_list(std::vector black_list) diff --git a/src/MeoAssistant/DebugTask.cpp b/src/MeoAssistant/DebugTask.cpp index 2b10b2911f..a66ba6de39 100644 --- a/src/MeoAssistant/DebugTask.cpp +++ b/src/MeoAssistant/DebugTask.cpp @@ -2,6 +2,8 @@ #include +#include "NoWarningCV.h" + //#include "RoguelikeSkillSelectionTaskPlugin.h" #include "StageDropsImageAnalyzer.h" diff --git a/src/MeoAssistant/DepotImageAnalyzer.cpp b/src/MeoAssistant/DepotImageAnalyzer.cpp index 6f6788eff9..21a83c308d 100644 --- a/src/MeoAssistant/DepotImageAnalyzer.cpp +++ b/src/MeoAssistant/DepotImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "DepotImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "TaskData.h" diff --git a/src/MeoAssistant/HashImageAnalyzer.cpp b/src/MeoAssistant/HashImageAnalyzer.cpp index ed6318df5c..64f3c2eb59 100644 --- a/src/MeoAssistant/HashImageAnalyzer.cpp +++ b/src/MeoAssistant/HashImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "HashImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" diff --git a/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp b/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp index f3a96e182d..b7a365d483 100644 --- a/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastClueVacancyImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "MatchImageAnalyzer.h" diff --git a/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp b/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp index fa90f6d881..4e9c789853 100644 --- a/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastFacilityImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "MultiMatchImageAnalyzer.h" diff --git a/src/MeoAssistant/InfrastOperImageAnalyzer.cpp b/src/MeoAssistant/InfrastOperImageAnalyzer.cpp index 084517867f..7edd306a93 100644 --- a/src/MeoAssistant/InfrastOperImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastOperImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastOperImageAnalyzer.h" +#include "NoWarningCV.h" + #include "InfrastSmileyImageAnalyzer.h" #include "MatchImageAnalyzer.h" #include "HashImageAnalyzer.h" diff --git a/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp b/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp index 4a15e873ef..64aa68f4fc 100644 --- a/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastSmileyImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "MultiMatchImageAnalyzer.h" #include "Resource.h" diff --git a/src/MeoAssistant/MatchImageAnalyzer.cpp b/src/MeoAssistant/MatchImageAnalyzer.cpp index 0732ae140c..f6fb15341d 100644 --- a/src/MeoAssistant/MatchImageAnalyzer.cpp +++ b/src/MeoAssistant/MatchImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "MatchImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "Resource.h" diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index a22d9b8f77..2a2a98d1c5 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -31,7 +31,7 @@ - + @@ -40,6 +40,8 @@ + + diff --git a/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index 392fc9ec49..f8a211d494 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -366,7 +366,13 @@ 头文件\Task\Plugin\Roguelike - + + 头文件\Utils + + + 头文件\Utils + + 头文件\Utils diff --git a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp index 83ad866d42..b5ef709534 100644 --- a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp +++ b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp @@ -2,6 +2,8 @@ #include +#include "NoWarningCV.h" + #include "Logger.hpp" #include "Resource.h" #include "TaskData.h" diff --git a/src/MeoAssistant/NoWarningCV.h b/src/MeoAssistant/NoWarningCV.h new file mode 100644 index 0000000000..61c79c08e7 --- /dev/null +++ b/src/MeoAssistant/NoWarningCV.h @@ -0,0 +1,7 @@ +#pragma once + +#include "AsstConf.h" + +ASST_SUPPRESS_CV_WARNINGS_START +#include +ASST_SUPPRESS_CV_WARNINGS_END diff --git a/src/MeoAssistant/NoWarningCVMat.h b/src/MeoAssistant/NoWarningCVMat.h new file mode 100644 index 0000000000..d825243ec2 --- /dev/null +++ b/src/MeoAssistant/NoWarningCVMat.h @@ -0,0 +1,7 @@ +#pragma once + +#include "AsstConf.h" + +ASST_SUPPRESS_CV_WARNINGS_START +#include +ASST_SUPPRESS_CV_WARNINGS_END diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 57d5a24213..e5b23cbdbd 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -2,11 +2,8 @@ #include +#include "NoWarningCV.h" #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END #include "AsstUtils.hpp" #include "Logger.hpp" diff --git a/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp b/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp index 6ab312ecf3..1dea221458 100644 --- a/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp +++ b/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "OcrWithPreprocessImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" bool asst::OcrWithPreprocessImageAnalyzer::analyze() diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp index 4292c8a8f8..2ea9afcf62 100644 --- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp @@ -3,6 +3,8 @@ #include #include +#include "NoWarningCV.h" + #include "BattleImageAnalyzer.h" #include "Controller.h" #include "TaskData.h" diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.h b/src/MeoAssistant/RoguelikeBattleTaskPlugin.h index 0d4a52c09a..64756ee34e 100644 --- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.h +++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "AbstractTaskPlugin.h" #include "AsstTypes.h" #include "TilePack.h" diff --git a/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp b/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp index 98afc5a78f..6483a8f5b5 100644 --- a/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp +++ b/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "RoguelikeFormationImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "MultiMatchImageAnalyzer.h" #include "TaskData.h" diff --git a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp index e83ea309c7..04b0ffd0d1 100644 --- a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "RoguelikeSkillSelectionImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "OcrWithPreprocessImageAnalyzer.h" #include "MultiMatchImageAnalyzer.h" diff --git a/src/MeoAssistant/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/StageDropsImageAnalyzer.cpp index 0a1fa12677..ec2f33f644 100644 --- a/src/MeoAssistant/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/StageDropsImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "StageDropsImageAnalyzer.h" +#include "NoWarningCV.h" + #include "TaskData.h" #include "OcrWithPreprocessImageAnalyzer.h" #include "MatchImageAnalyzer.h" diff --git a/src/MeoAssistant/TemplResource.cpp b/src/MeoAssistant/TemplResource.cpp index 735367eb61..2f7132117e 100644 --- a/src/MeoAssistant/TemplResource.cpp +++ b/src/MeoAssistant/TemplResource.cpp @@ -4,6 +4,8 @@ #include #include +#include "NoWarningCV.h" + #include "Logger.hpp" void asst::TemplResource::set_load_required(std::unordered_set required) noexcept diff --git a/src/MeoAssistant/TemplResource.h b/src/MeoAssistant/TemplResource.h index 57907457ab..8a65bfe762 100644 --- a/src/MeoAssistant/TemplResource.h +++ b/src/MeoAssistant/TemplResource.h @@ -5,10 +5,7 @@ #include #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" namespace asst { diff --git a/src/MeoAssistant/TilePack.cpp b/src/MeoAssistant/TilePack.cpp index 95037b598d..5f9fb2bfc4 100644 --- a/src/MeoAssistant/TilePack.cpp +++ b/src/MeoAssistant/TilePack.cpp @@ -1,6 +1,6 @@ #include "TilePack.h" -#include "Config.hpp" +#include "AsstConf.h" ASST_SUPPRESS_CV_WARNINGS_START #include ASST_SUPPRESS_CV_WARNINGS_END