From cc17d30e9fac534bc90d4bc18d10ef27cf0f3169 Mon Sep 17 00:00:00 2001 From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com> Date: Sat, 30 Jul 2022 06:18:25 +0800 Subject: [PATCH 1/3] revert. add std:: --- src/MeoAssistant/AsstInfrastDef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index 406c0847e6..2f088add62 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -83,7 +83,7 @@ namespace asst::infrast SkillsComb() = default; SkillsComb(std::unordered_set skill_vec) { - skills = move(skill_vec); + skills = std::move(skill_vec); for (const auto& s : skills) { for (const auto& [key, value] : s.efficient) { efficient[key] += value; From 5658a630bd43f4122a5792ebf03f04cbbd7afaa9 Mon Sep 17 00:00:00 2001 From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com> Date: Sat, 30 Jul 2022 06:18:47 +0800 Subject: [PATCH 2/3] revert. add asst:: --- src/MeoAssistant/OcrPack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index c1502c4026..38fe80ce30 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -118,7 +118,7 @@ std::vector asst::OcrPack::recognize(const cv::Mat& image, const return result; } -std::vector asst::OcrPack::recognize(const cv::Mat& image, const Rect& roi, const TextRectProc& pred, bool without_det) +std::vector asst::OcrPack::recognize(const cv::Mat& image, const Rect& roi, const asst::TextRectProc& pred, bool without_det) { auto rect_cor = [&roi, &pred, &without_det](TextRect& tr) -> bool { if (without_det) { From 2f5bc535447a8e74b6cb69fd532a9a825ae87ba5 Mon Sep 17 00:00:00 2001 From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com> Date: Sat, 30 Jul 2022 06:18:55 +0800 Subject: [PATCH 3/3] revert. add asst:: --- src/MeoAssistant/OcrPack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 38fe80ce30..5b31c2922a 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -53,7 +53,7 @@ bool asst::OcrPack::load(const std::string& dir) return m_ocr != nullptr; } -std::vector asst::OcrPack::recognize(const cv::Mat& image, const TextRectProc& pred, bool without_det) +std::vector asst::OcrPack::recognize(const cv::Mat& image, const asst::TextRectProc& pred, bool without_det) { LogTraceFunction;