fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'myfork/dev' into dev

Browse Source
This commit is contained in:
lhhxxxxx
2022-07-30 18:25:32 +08:00
parent a579d8b944 2f5bc53544
commit cdc98eefe8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MeoAssistant/AsstInfrastDef.h
View File

@@ -82,7 +82,7 @@ namespace asst::infrast
SkillsComb() = default;
SkillsComb(std::unordered_set<Skill> 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;

4
src/MeoAssistant/OcrPack.cpp
View File

@@ -53,7 +53,7 @@ bool asst::OcrPack::load(const std::string& dir)
return m_ocr != nullptr;
}
std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const TextRectProc& pred, bool without_det)
std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const asst::TextRectProc& pred, bool without_det)
{
LogTraceFunction;
@@ -118,7 +118,7 @@ std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const
return result;
}
std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const Rect& roi, const TextRectProc& pred, bool without_det)
std::vector<asst::TextRect> 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) {