From 73559816c37023be13ba2e8cfb314b19d2eaee93 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 17 Oct 2021 04:27:43 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BC=96=E8=AF=91warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistance/AbstractTask.cpp | 2 +- src/MeoAssistance/MultiMatchImageAnalyzer.cpp | 2 +- src/MeoAssistance/RecruitTask.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MeoAssistance/AbstractTask.cpp b/src/MeoAssistance/AbstractTask.cpp index aaf308a811..9319cef977 100644 --- a/src/MeoAssistance/AbstractTask.cpp +++ b/src/MeoAssistance/AbstractTask.cpp @@ -34,7 +34,7 @@ bool AbstractTask::sleep(unsigned millisecond) return true; } auto start = std::chrono::system_clock::now(); - unsigned duration = 0; + long long duration = 0; json::value callback_json; callback_json["time"] = millisecond; diff --git a/src/MeoAssistance/MultiMatchImageAnalyzer.cpp b/src/MeoAssistance/MultiMatchImageAnalyzer.cpp index 5a2bcbab33..fe047506ab 100644 --- a/src/MeoAssistance/MultiMatchImageAnalyzer.cpp +++ b/src/MeoAssistance/MultiMatchImageAnalyzer.cpp @@ -54,7 +54,7 @@ bool asst::MultiMatchImageAnalyzer::multi_match_templ(const cv::Mat& templ) cv::matchTemplate(image_roi, templ, matched, cv::TM_CCOEFF_NORMED, mask); } - int mini_distance = (std::min)(templ.cols, templ.rows) * 0.5; + int mini_distance = (std::min)(templ.cols, templ.rows) / 2; for (int i = 0; i != matched.rows; ++i) { for (int j = 0; j != matched.cols; ++j) { auto value = matched.at(i, j); diff --git a/src/MeoAssistance/RecruitTask.cpp b/src/MeoAssistance/RecruitTask.cpp index 51e90b7fb8..7b5f9c2e5e 100644 --- a/src/MeoAssistance/RecruitTask.cpp +++ b/src/MeoAssistance/RecruitTask.cpp @@ -63,8 +63,8 @@ bool RecruitTask::run() // 识别到的5个Tags,全组合排列 std::vector> all_combs; - int len = all_tags.size(); - int count = std::pow(2, len); + size_t len = all_tags.size(); + int count = (std::pow)(2, len); for (int i = 0; i < count; ++i) { std::vector temp; for (int j = 0, mask = 1; j < len; ++j) {