diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index cc315d6037..92641f7335 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -82,7 +82,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; diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index c1502c4026..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; @@ -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) {