From 425a28712137e4d22f662cc128c6662e2ea3d11d Mon Sep 17 00:00:00 2001 From: lhhxxxxx Date: Mon, 6 Jun 2022 20:02:51 +0800 Subject: [PATCH] perf. use const& or std::move() --- src/MeoAssistant/AbstractImageAnalyzer.cpp | 6 +++--- src/MeoAssistant/AbstractImageAnalyzer.h | 6 +++--- src/MeoAssistant/AbstractTask.cpp | 9 +++++---- src/MeoAssistant/AbstractTask.h | 2 +- src/MeoAssistant/AipOcr.cpp | 6 +++--- src/MeoAssistant/AipOcr.h | 6 +++--- src/MeoAssistant/AwardTask.cpp | 4 +++- src/MeoAssistant/Controller.cpp | 4 ++-- src/MeoAssistant/Controller.h | 2 +- src/MeoAssistant/CopilotTask.cpp | 2 +- src/MeoAssistant/CopilotTask.h | 2 +- src/MeoAssistant/DebugTask.cpp | 2 +- src/MeoAssistant/DebugTask.h | 2 +- src/MeoAssistant/FightTask.cpp | 4 +++- src/MeoAssistant/InfrastAbstractTask.cpp | 3 ++- src/MeoAssistant/InfrastTask.cpp | 2 +- src/MeoAssistant/InfrastTask.h | 2 +- src/MeoAssistant/MallTask.cpp | 2 +- src/MeoAssistant/MallTask.h | 2 +- src/MeoAssistant/MatchImageAnalyzer.cpp | 4 ++-- src/MeoAssistant/MatchImageAnalyzer.h | 4 ++-- src/MeoAssistant/MultiMatchImageAnalyzer.cpp | 8 +++++--- src/MeoAssistant/MultiMatchImageAnalyzer.h | 4 ++-- src/MeoAssistant/OcrPack.cpp | 4 ++-- src/MeoAssistant/OcrPack.h | 4 ++-- src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.cpp | 7 ++++--- src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.h | 6 +++--- src/MeoAssistant/ProcessTaskImageAnalyzer.cpp | 9 +++++---- src/MeoAssistant/ProcessTaskImageAnalyzer.h | 6 +++--- src/MeoAssistant/RecruitTask.cpp | 2 +- src/MeoAssistant/RecruitTask.h | 2 +- src/MeoAssistant/RoguelikeTask.cpp | 2 +- src/MeoAssistant/RoguelikeTask.h | 2 +- src/MeoAssistant/StageDropsImageAnalyzer.cpp | 2 +- src/MeoAssistant/StartUpTask.cpp | 4 +++- src/MeoAssistant/VisitTask.cpp | 4 +++- 36 files changed, 78 insertions(+), 64 deletions(-) diff --git a/src/MeoAssistant/AbstractImageAnalyzer.cpp b/src/MeoAssistant/AbstractImageAnalyzer.cpp index 47b64df6df..c5b7bd9650 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/AbstractImageAnalyzer.cpp @@ -4,7 +4,7 @@ #include "Controller.h" #include "Logger.hpp" -asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat image) +asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat& image) : m_image(image), m_roi(empty_rect_to_full(Rect(), image)) #ifdef ASST_DEBUG , @@ -12,7 +12,7 @@ asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat image) #endif {} -asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat image, const Rect& roi) +asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat& image, const Rect& roi) : m_image(image), m_roi(empty_rect_to_full(roi, image)) #ifdef ASST_DEBUG @@ -42,7 +42,7 @@ void asst::AbstractImageAnalyzer::set_roi(const Rect& roi) noexcept m_roi = empty_rect_to_full(roi, m_image); } -asst::Rect asst::AbstractImageAnalyzer::empty_rect_to_full(const Rect& rect, const cv::Mat image) noexcept +asst::Rect asst::AbstractImageAnalyzer::empty_rect_to_full(const Rect& rect, const cv::Mat& image) noexcept { if (image.empty()) { return rect; diff --git a/src/MeoAssistant/AbstractImageAnalyzer.h b/src/MeoAssistant/AbstractImageAnalyzer.h index 87105f99fd..6cb1385bb0 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/AbstractImageAnalyzer.h @@ -15,8 +15,8 @@ namespace asst { public: AbstractImageAnalyzer() = default; - AbstractImageAnalyzer(const cv::Mat image); - AbstractImageAnalyzer(const cv::Mat image, const Rect& roi); + AbstractImageAnalyzer(const cv::Mat& image); + AbstractImageAnalyzer(const cv::Mat& image, const Rect& roi); AbstractImageAnalyzer(const AbstractImageAnalyzer&) = delete; AbstractImageAnalyzer(AbstractImageAnalyzer&&) = delete; virtual ~AbstractImageAnalyzer() = default; @@ -31,7 +31,7 @@ namespace asst AbstractImageAnalyzer& operator=(AbstractImageAnalyzer&&) = delete; protected: - static Rect empty_rect_to_full(const Rect& rect, const cv::Mat image) noexcept; + static Rect empty_rect_to_full(const Rect& rect, const cv::Mat& image) noexcept; bool save_img(); diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index fb34ecd1c0..cce02e5cc2 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "AsstUtils.hpp" #include "Controller.h" @@ -16,7 +17,7 @@ using namespace asst; AbstractTask::AbstractTask(AsstCallback callback, void* callback_arg, std::string task_chain) - : m_callback(callback), + : m_callback(std::move(callback)), m_callback_arg(callback_arg), m_task_chain(std::move(task_chain)) { @@ -64,13 +65,13 @@ AbstractTask& asst::AbstractTask::set_retry_times(int times) noexcept AbstractTask& asst::AbstractTask::set_ctrler(std::shared_ptr ctrler) noexcept { - m_ctrler = ctrler; + m_ctrler = std::move(ctrler); return *this; } AbstractTask& asst::AbstractTask::set_status(std::shared_ptr status) noexcept { - m_status = status; + m_status = std::move(status); return *this; } @@ -158,7 +159,7 @@ bool AbstractTask::sleep(unsigned millisecond) return !need_exit(); } -bool AbstractTask::save_image(const cv::Mat image, const std::string& dir) +bool AbstractTask::save_image(const cv::Mat& image, const std::string& dir) { std::filesystem::create_directory(dir); const std::string time_str = utils::string_replace_all(utils::string_replace_all(utils::get_format_time(), " ", "_"), ":", "-"); diff --git a/src/MeoAssistant/AbstractTask.h b/src/MeoAssistant/AbstractTask.h index b7466492ad..6d768ab051 100644 --- a/src/MeoAssistant/AbstractTask.h +++ b/src/MeoAssistant/AbstractTask.h @@ -67,7 +67,7 @@ namespace asst json::value basic_info_with_what(std::string what) const; bool sleep(unsigned millisecond); bool need_exit() const; - bool save_image(const cv::Mat image, const std::string& dir); + bool save_image(const cv::Mat& image, const std::string& dir); bool m_enable = true; bool m_ignore_error = true; diff --git a/src/MeoAssistant/AipOcr.cpp b/src/MeoAssistant/AipOcr.cpp index f8f57d1138..3d43a91161 100644 --- a/src/MeoAssistant/AipOcr.cpp +++ b/src/MeoAssistant/AipOcr.cpp @@ -47,7 +47,7 @@ bool asst::AipOcr::request_access_token(const std::string& client_id, const std: return true; } -bool asst::AipOcr::request_ocr_general(const cv::Mat image, std::vector& out_result, const TextRectProc& pred) +bool asst::AipOcr::request_ocr_general(const cv::Mat& image, std::vector& out_result, const TextRectProc& pred) { LogTraceFunction; @@ -62,7 +62,7 @@ bool asst::AipOcr::request_ocr_general(const cv::Mat image, std::vector& out_result, const TextRectProc& pred) +bool asst::AipOcr::request_ocr_accurate(const cv::Mat& image, std::vector& out_result, const TextRectProc& pred) { LogTraceFunction; @@ -77,7 +77,7 @@ bool asst::AipOcr::request_ocr_accurate(const cv::Mat image, std::vector& out_result, const TextRectProc& pred) +bool asst::AipOcr::request_ocr_and_parse(std::string_view cmd_fmt, const cv::Mat& image, std::vector& out_result, const TextRectProc& pred) { if (m_access_token.empty()) { return false; diff --git a/src/MeoAssistant/AipOcr.h b/src/MeoAssistant/AipOcr.h index 506f24f73f..90f2c87a77 100644 --- a/src/MeoAssistant/AipOcr.h +++ b/src/MeoAssistant/AipOcr.h @@ -27,15 +27,15 @@ namespace asst } bool request_access_token(const std::string& client_id, const std::string& client_secret); - bool request_ocr_general(const cv::Mat image, std::vector& out_result, const TextRectProc& pred = nullptr); - bool request_ocr_accurate(const cv::Mat image, std::vector& out_result, const TextRectProc& pred = nullptr); + bool request_ocr_general(const cv::Mat& image, std::vector& out_result, const TextRectProc& pred = nullptr); + bool request_ocr_accurate(const cv::Mat& image, std::vector& out_result, const TextRectProc& pred = nullptr); private: AipOcr() = default; AipOcr(const AipOcr&) = default; AipOcr(AipOcr&&) noexcept = default; - bool request_ocr_and_parse(std::string_view cmd_fmt, const cv::Mat image, std::vector& out_result, const TextRectProc& pred = nullptr); + bool request_ocr_and_parse(std::string_view cmd_fmt, const cv::Mat& image, std::vector& out_result, const TextRectProc& pred = nullptr); bool parse_response(const json::value& json, std::vector& out_result, const TextRectProc& pred = nullptr); std::string m_access_token; diff --git a/src/MeoAssistant/AwardTask.cpp b/src/MeoAssistant/AwardTask.cpp index 85602e5322..d1ca1e9316 100644 --- a/src/MeoAssistant/AwardTask.cpp +++ b/src/MeoAssistant/AwardTask.cpp @@ -1,9 +1,11 @@ #include "AwardTask.h" +#include + #include "ProcessTask.h" asst::AwardTask::AwardTask(AsstCallback callback, void* callback_arg) - : PackageTask(callback, callback_arg, TaskType), + : PackageTask(std::move(callback), callback_arg, TaskType), m_award_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)) { m_award_task_ptr->set_tasks({ "AwardBegin" }); diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index c51b57e8e0..013677ea54 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -55,7 +55,7 @@ private: #endif asst::Controller::Controller(AsstCallback callback, void* callback_arg) - : m_callback(callback), + : m_callback(std::move(callback)), m_callback_arg(callback_arg), m_rand_engine(static_cast(time(nullptr))) { @@ -630,7 +630,7 @@ bool asst::Controller::screencap() return false; } -bool asst::Controller::screencap(const std::string& cmd, DecodeFunc decode_func, bool by_socket) +bool asst::Controller::screencap(const std::string& cmd, const DecodeFunc& decode_func, bool by_socket) { if ((!m_support_socket || !m_server_started) && by_socket) { return false; diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index 85c24d0972..df6d3d55ea 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -75,7 +75,7 @@ namespace asst using DecodeFunc = std::function&)>; bool screencap(); - bool screencap(const std::string& cmd, DecodeFunc decode_func, bool by_nc = false); + bool screencap(const std::string& cmd, const DecodeFunc& decode_func, bool by_nc = false); cv::Mat get_resized_image() const; Point rand_point_in_rect(const Rect& rect); diff --git a/src/MeoAssistant/CopilotTask.cpp b/src/MeoAssistant/CopilotTask.cpp index 4baf8a645a..71c6354ef7 100644 --- a/src/MeoAssistant/CopilotTask.cpp +++ b/src/MeoAssistant/CopilotTask.cpp @@ -5,7 +5,7 @@ #include "BattleProcessTask.h" #include "BattleFormationTask.h" -asst::CopilotTask::CopilotTask(AsstCallback callback, void* callback_arg) +asst::CopilotTask::CopilotTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), m_formation_task_ptr(std::make_shared(callback, callback_arg, TaskType)), m_battle_task_ptr(std::make_shared(callback, callback_arg, TaskType)) diff --git a/src/MeoAssistant/CopilotTask.h b/src/MeoAssistant/CopilotTask.h index e154ee617f..9d4a13d301 100644 --- a/src/MeoAssistant/CopilotTask.h +++ b/src/MeoAssistant/CopilotTask.h @@ -12,7 +12,7 @@ namespace asst class CopilotTask final : public PackageTask { public: - CopilotTask(AsstCallback callback, void* callback_arg); + CopilotTask(const AsstCallback& callback, void* callback_arg); virtual ~CopilotTask() = default; virtual bool set_params(const json::value& params) override; diff --git a/src/MeoAssistant/DebugTask.cpp b/src/MeoAssistant/DebugTask.cpp index eee4bb1f37..05d3d0ca94 100644 --- a/src/MeoAssistant/DebugTask.cpp +++ b/src/MeoAssistant/DebugTask.cpp @@ -4,7 +4,7 @@ #include "StageDropsTaskPlugin.h" -asst::DebugTask::DebugTask(AsstCallback callback, void* callback_arg) +asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType) { //auto task_ptr = std::make_shared(callback, callback_arg, TaskType); diff --git a/src/MeoAssistant/DebugTask.h b/src/MeoAssistant/DebugTask.h index 0135e4c6cc..2f3764711f 100644 --- a/src/MeoAssistant/DebugTask.h +++ b/src/MeoAssistant/DebugTask.h @@ -6,7 +6,7 @@ namespace asst class DebugTask : public PackageTask { public: - DebugTask(AsstCallback callback, void* callback_arg); + DebugTask(const AsstCallback& callback, void* callback_arg); virtual ~DebugTask() = default; static constexpr const char* TaskType = "Debug"; diff --git a/src/MeoAssistant/FightTask.cpp b/src/MeoAssistant/FightTask.cpp index 98b7f3df9d..db00647062 100644 --- a/src/MeoAssistant/FightTask.cpp +++ b/src/MeoAssistant/FightTask.cpp @@ -1,10 +1,12 @@ #include "FightTask.h" +#include + #include "ProcessTask.h" #include "StageDropsTaskPlugin.h" asst::FightTask::FightTask(AsstCallback callback, void* callback_arg) - : PackageTask(callback, callback_arg, TaskType), + : PackageTask(std::move(callback), callback_arg, TaskType), m_start_up_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)), m_stage_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)), m_fight_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)) diff --git a/src/MeoAssistant/InfrastAbstractTask.cpp b/src/MeoAssistant/InfrastAbstractTask.cpp index 8ccaf45a44..558df9ff0a 100644 --- a/src/MeoAssistant/InfrastAbstractTask.cpp +++ b/src/MeoAssistant/InfrastAbstractTask.cpp @@ -1,6 +1,7 @@ #include "InfrastAbstractTask.h" #include +#include #include "AsstMsg.h" #include "Controller.h" @@ -12,7 +13,7 @@ #include "ProcessTask.h" asst::InfrastAbstractTask::InfrastAbstractTask(AsstCallback callback, void* callback_arg, std::string task_chain) - : AbstractTask(callback, callback_arg, task_chain) + : AbstractTask(std::move(callback), callback_arg, std::move(task_chain)) { m_retry_times = TaskRetryTimes; } diff --git a/src/MeoAssistant/InfrastTask.cpp b/src/MeoAssistant/InfrastTask.cpp index a13511ac78..8ecb0c07c5 100644 --- a/src/MeoAssistant/InfrastTask.cpp +++ b/src/MeoAssistant/InfrastTask.cpp @@ -14,7 +14,7 @@ #include "DronesForShamareTaskPlugin.h" #include "ReplenishOriginiumShardTaskPlugin.h" -asst::InfrastTask::InfrastTask(AsstCallback callback, void* callback_arg) +asst::InfrastTask::InfrastTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), m_infrast_begin_task_ptr(std::make_shared(callback, callback_arg, TaskType)), m_info_task_ptr(std::make_shared(callback, callback_arg, TaskType)), diff --git a/src/MeoAssistant/InfrastTask.h b/src/MeoAssistant/InfrastTask.h index 8cf047d01a..ba448e5d1f 100644 --- a/src/MeoAssistant/InfrastTask.h +++ b/src/MeoAssistant/InfrastTask.h @@ -18,7 +18,7 @@ namespace asst { public: public: - InfrastTask(AsstCallback callback, void* callback_arg); + InfrastTask(const AsstCallback& callback, void* callback_arg); virtual ~InfrastTask() = default; virtual bool set_params(const json::value& params) override; diff --git a/src/MeoAssistant/MallTask.cpp b/src/MeoAssistant/MallTask.cpp index a8689cdc59..a62f8f42c6 100644 --- a/src/MeoAssistant/MallTask.cpp +++ b/src/MeoAssistant/MallTask.cpp @@ -3,7 +3,7 @@ #include "ProcessTask.h" #include "CreditShoppingTask.h" -asst::MallTask::MallTask(AsstCallback callback, void* callback_arg) +asst::MallTask::MallTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), m_mall_task_ptr(std::make_shared(callback, callback_arg, TaskType)), m_shopping_first_task_ptr(std::make_shared(callback, callback_arg, TaskType)), diff --git a/src/MeoAssistant/MallTask.h b/src/MeoAssistant/MallTask.h index 1d36f5f333..488ed3a594 100644 --- a/src/MeoAssistant/MallTask.h +++ b/src/MeoAssistant/MallTask.h @@ -9,7 +9,7 @@ namespace asst class MallTask final : public PackageTask { public: - MallTask(AsstCallback callback, void* callback_arg); + MallTask(const AsstCallback& callback, void* callback_arg); virtual ~MallTask() = default; virtual bool set_params(const json::value& params) override; diff --git a/src/MeoAssistant/MatchImageAnalyzer.cpp b/src/MeoAssistant/MatchImageAnalyzer.cpp index ef30219e54..b0b5c0f222 100644 --- a/src/MeoAssistant/MatchImageAnalyzer.cpp +++ b/src/MeoAssistant/MatchImageAnalyzer.cpp @@ -4,7 +4,7 @@ #include "Logger.hpp" #include "Resource.h" -asst::MatchImageAnalyzer::MatchImageAnalyzer(const cv::Mat image, const Rect& roi, std::string templ_name, double templ_thres) +asst::MatchImageAnalyzer::MatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres) : AbstractImageAnalyzer(image, roi), m_templ_name(std::move(templ_name)), m_templ_thres(templ_thres) @@ -54,7 +54,7 @@ void asst::MatchImageAnalyzer::set_threshold(double templ_thres) noexcept m_templ_thres = templ_thres; } -void asst::MatchImageAnalyzer::set_task_info(std::shared_ptr task_ptr) +void asst::MatchImageAnalyzer::set_task_info(const std::shared_ptr& task_ptr) { set_task_info(*std::dynamic_pointer_cast(task_ptr)); } diff --git a/src/MeoAssistant/MatchImageAnalyzer.h b/src/MeoAssistant/MatchImageAnalyzer.h index 4372f562b5..13d3add775 100644 --- a/src/MeoAssistant/MatchImageAnalyzer.h +++ b/src/MeoAssistant/MatchImageAnalyzer.h @@ -7,7 +7,7 @@ namespace asst { public: using AbstractImageAnalyzer::AbstractImageAnalyzer; - MatchImageAnalyzer(const cv::Mat image, const Rect& roi, std::string templ_name, double templ_thres = 0.0); + MatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres = 0.0); virtual ~MatchImageAnalyzer() = default; virtual bool analyze() override; @@ -18,7 +18,7 @@ namespace asst void set_templ_name(std::string templ_name) noexcept; void set_templ(cv::Mat templ) noexcept; void set_threshold(double templ_thres) noexcept; - void set_task_info(std::shared_ptr task_ptr); + void set_task_info(const std::shared_ptr& task_ptr); void set_task_info(const std::string& task_name); void set_region_of_appeared(Rect region) noexcept; void set_mask_with_close(int with_close) noexcept; diff --git a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp index d8e8a80927..bb744fcd8d 100644 --- a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp +++ b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp @@ -1,12 +1,14 @@ #include "MultiMatchImageAnalyzer.h" +#include + #include "Logger.hpp" #include "Resource.h" #include "TaskData.h" -asst::MultiMatchImageAnalyzer::MultiMatchImageAnalyzer(const cv::Mat image, const Rect& roi, std::string templ_name, double templ_thres) +asst::MultiMatchImageAnalyzer::MultiMatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres) : AbstractImageAnalyzer(image, roi), - m_templ_name(templ_name), + m_templ_name(std::move(templ_name)), m_templ_thres(templ_thres) { ; @@ -68,7 +70,7 @@ void asst::MultiMatchImageAnalyzer::set_task_info(MatchTaskInfo task_info) noexc set_roi(task_info.roi); } -void asst::MultiMatchImageAnalyzer::set_task_info(std::shared_ptr task_ptr) +void asst::MultiMatchImageAnalyzer::set_task_info(const std::shared_ptr& task_ptr) { set_task_info(*std::dynamic_pointer_cast(task_ptr)); } diff --git a/src/MeoAssistant/MultiMatchImageAnalyzer.h b/src/MeoAssistant/MultiMatchImageAnalyzer.h index 85f26e171e..7ea5972536 100644 --- a/src/MeoAssistant/MultiMatchImageAnalyzer.h +++ b/src/MeoAssistant/MultiMatchImageAnalyzer.h @@ -7,7 +7,7 @@ namespace asst { public: using AbstractImageAnalyzer::AbstractImageAnalyzer; - MultiMatchImageAnalyzer(const cv::Mat image, const Rect& roi, std::string templ_name, double templ_thres); + MultiMatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres); virtual ~MultiMatchImageAnalyzer() = default; virtual bool analyze() override; @@ -19,7 +19,7 @@ namespace asst void set_templ_name(std::string templ_name) noexcept; void set_threshold(double templ_thres) noexcept; - void set_task_info(std::shared_ptr task_ptr); + void set_task_info(const std::shared_ptr& task_ptr); void set_task_info(const std::string& task_name); const std::vector& get_result() const noexcept; diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 0e14974375..ca8275d289 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -52,7 +52,7 @@ bool asst::OcrPack::load(const std::string& dir) return m_ocr != nullptr; } -std::vector asst::OcrPack::recognize(const cv::Mat image, const asst::TextRectProc& pred, bool without_det) +std::vector asst::OcrPack::recognize(const cv::Mat& image, const asst::TextRectProc& pred, bool without_det) { LogTraceFunction; @@ -117,7 +117,7 @@ std::vector asst::OcrPack::recognize(const cv::Mat image, const return result; } -std::vector asst::OcrPack::recognize(const cv::Mat image, const asst::Rect& roi, const asst::TextRectProc& pred, bool without_det) +std::vector asst::OcrPack::recognize(const cv::Mat& image, const asst::Rect& roi, const asst::TextRectProc& pred, bool without_det) { auto rect_cor = [&roi, &pred, &without_det](TextRect& tr) -> bool { if (without_det) { diff --git a/src/MeoAssistant/OcrPack.h b/src/MeoAssistant/OcrPack.h index f6cda6fa93..c68662d8e6 100644 --- a/src/MeoAssistant/OcrPack.h +++ b/src/MeoAssistant/OcrPack.h @@ -23,8 +23,8 @@ namespace asst virtual bool load(const std::string& dir) override; - std::vector recognize(const cv::Mat image, const TextRectProc& pred = nullptr, bool without_det = false); - std::vector recognize(const cv::Mat image, const Rect& roi, const TextRectProc& pred = nullptr, bool without_det = false); + std::vector recognize(const cv::Mat& image, const TextRectProc& pred = nullptr, bool without_det = false); + std::vector recognize(const cv::Mat& image, const Rect& roi, const TextRectProc& pred = nullptr, bool without_det = false); private: paddle_ocr_t* m_ocr = nullptr; diff --git a/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.cpp b/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.cpp index 7c1ecaab30..7d6ff72979 100644 --- a/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.cpp +++ b/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.cpp @@ -2,12 +2,12 @@ #include "TaskData.h" -asst::OcrWithFlagTemplImageAnalyzer::OcrWithFlagTemplImageAnalyzer(const cv::Mat image) +asst::OcrWithFlagTemplImageAnalyzer::OcrWithFlagTemplImageAnalyzer(const cv::Mat& image) : OcrWithPreprocessImageAnalyzer(image), m_multi_match_image_analyzer(image) {} -asst::OcrWithFlagTemplImageAnalyzer::OcrWithFlagTemplImageAnalyzer(const cv::Mat image, const Rect& roi) +asst::OcrWithFlagTemplImageAnalyzer::OcrWithFlagTemplImageAnalyzer(const cv::Mat& image, const Rect& roi) : OcrWithPreprocessImageAnalyzer(image, roi), m_multi_match_image_analyzer(image, roi) {} @@ -59,7 +59,8 @@ const std::vector& asst::OcrWithFlagTemplImageAnalyzer::get_resu return m_all_result; } -void asst::OcrWithFlagTemplImageAnalyzer::set_task_info(std::string templ_task_name, std::string ocr_task_name) +void asst::OcrWithFlagTemplImageAnalyzer::set_task_info(const std::string& templ_task_name, const std::string& + ocr_task_name) { auto ocr_task_ptr = std::dynamic_pointer_cast(Task.get(ocr_task_name)); OcrWithPreprocessImageAnalyzer::set_task_info(*ocr_task_ptr); diff --git a/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.h b/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.h index e28a8df519..2d69593fbb 100644 --- a/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.h +++ b/src/MeoAssistant/OcrWithFlagTemplImageAnalyzer.h @@ -8,8 +8,8 @@ namespace asst { public: OcrWithFlagTemplImageAnalyzer() = default; - OcrWithFlagTemplImageAnalyzer(const cv::Mat image); - OcrWithFlagTemplImageAnalyzer(const cv::Mat image, const Rect& roi); + OcrWithFlagTemplImageAnalyzer(const cv::Mat& image); + OcrWithFlagTemplImageAnalyzer(const cv::Mat& image, const Rect& roi); virtual ~OcrWithFlagTemplImageAnalyzer() = default; virtual void set_image(const cv::Mat image); @@ -21,7 +21,7 @@ namespace asst virtual const std::vector& get_result() const noexcept override; virtual std::vector& get_result() noexcept override; - void set_task_info(std::string templ_task_name, std::string ocr_task_name); + void set_task_info(const std::string& templ_task_name, const std::string& ocr_task_name); void set_flag_rect_move(Rect flag_rect_move); protected: diff --git a/src/MeoAssistant/ProcessTaskImageAnalyzer.cpp b/src/MeoAssistant/ProcessTaskImageAnalyzer.cpp index d10814e708..ec2184e02b 100644 --- a/src/MeoAssistant/ProcessTaskImageAnalyzer.cpp +++ b/src/MeoAssistant/ProcessTaskImageAnalyzer.cpp @@ -1,6 +1,7 @@ #include "ProcessTaskImageAnalyzer.h" #include +#include #include "AsstUtils.hpp" #include "Logger.hpp" @@ -9,7 +10,7 @@ #include "Resource.h" #include "RuntimeStatus.h" -asst::ProcessTaskImageAnalyzer::ProcessTaskImageAnalyzer(const cv::Mat image, std::vector tasks_name) +asst::ProcessTaskImageAnalyzer::ProcessTaskImageAnalyzer(const cv::Mat& image, std::vector tasks_name) : AbstractImageAnalyzer(image), m_tasks_name(std::move(tasks_name)) { @@ -18,7 +19,7 @@ asst::ProcessTaskImageAnalyzer::ProcessTaskImageAnalyzer(const cv::Mat image, st asst::ProcessTaskImageAnalyzer::~ProcessTaskImageAnalyzer() = default; -bool asst::ProcessTaskImageAnalyzer::match_analyze(std::shared_ptr task_ptr) +bool asst::ProcessTaskImageAnalyzer::match_analyze(const std::shared_ptr& task_ptr) { if (!m_match_analyzer) { m_match_analyzer = std::make_unique(m_image); @@ -40,7 +41,7 @@ bool asst::ProcessTaskImageAnalyzer::match_analyze(std::shared_ptr tas return false; } -bool asst::ProcessTaskImageAnalyzer::ocr_analyze(std::shared_ptr task_ptr) +bool asst::ProcessTaskImageAnalyzer::ocr_analyze(const std::shared_ptr& task_ptr) { std::shared_ptr ocr_task_ptr = std::dynamic_pointer_cast(task_ptr); @@ -149,5 +150,5 @@ void asst::ProcessTaskImageAnalyzer::set_tasks(std::vector tasks_na void asst::ProcessTaskImageAnalyzer::set_status(std::shared_ptr status) noexcept { - m_status = status; + m_status = std::move(status); } diff --git a/src/MeoAssistant/ProcessTaskImageAnalyzer.h b/src/MeoAssistant/ProcessTaskImageAnalyzer.h index 283a4db755..83ed27beeb 100644 --- a/src/MeoAssistant/ProcessTaskImageAnalyzer.h +++ b/src/MeoAssistant/ProcessTaskImageAnalyzer.h @@ -18,7 +18,7 @@ namespace asst public: using AbstractImageAnalyzer::AbstractImageAnalyzer; ProcessTaskImageAnalyzer(const cv::Mat image, const Rect& roi) = delete; - ProcessTaskImageAnalyzer(const cv::Mat image, std::vector tasks_name); + ProcessTaskImageAnalyzer(const cv::Mat& image, std::vector tasks_name); virtual ~ProcessTaskImageAnalyzer(); virtual bool analyze() override; @@ -49,8 +49,8 @@ namespace asst { AbstractImageAnalyzer::set_image(image, roi); } - bool match_analyze(std::shared_ptr task_ptr); - bool ocr_analyze(std::shared_ptr task_ptr); + bool match_analyze(const std::shared_ptr& task_ptr); + bool ocr_analyze(const std::shared_ptr& task_ptr); void reset() noexcept; std::unique_ptr m_ocr_analyzer; diff --git a/src/MeoAssistant/RecruitTask.cpp b/src/MeoAssistant/RecruitTask.cpp index db64a91a20..2c0d42d2c4 100644 --- a/src/MeoAssistant/RecruitTask.cpp +++ b/src/MeoAssistant/RecruitTask.cpp @@ -4,7 +4,7 @@ #include "RecruitCalcTask.h" #include "ProcessTask.h" -asst::RecruitTask::RecruitTask(AsstCallback callback, void* callback_arg) +asst::RecruitTask::RecruitTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), m_recruit_begin_task_ptr(std::make_shared(callback, callback_arg, TaskType)), m_auto_recruit_task_ptr(std::make_shared(callback, callback_arg, TaskType)), diff --git a/src/MeoAssistant/RecruitTask.h b/src/MeoAssistant/RecruitTask.h index f71b26d3b6..728ff27f51 100644 --- a/src/MeoAssistant/RecruitTask.h +++ b/src/MeoAssistant/RecruitTask.h @@ -10,7 +10,7 @@ namespace asst class RecruitTask final : public PackageTask { public: - RecruitTask(AsstCallback callback, void* callback_arg); + RecruitTask(const AsstCallback& callback, void* callback_arg); virtual ~RecruitTask() = default; virtual bool set_params(const json::value& params) override; diff --git a/src/MeoAssistant/RoguelikeTask.cpp b/src/MeoAssistant/RoguelikeTask.cpp index de8d86f154..4fccee9e44 100644 --- a/src/MeoAssistant/RoguelikeTask.cpp +++ b/src/MeoAssistant/RoguelikeTask.cpp @@ -9,7 +9,7 @@ #include "Logger.hpp" -asst::RoguelikeTask::RoguelikeTask(AsstCallback callback, void* callback_arg) +asst::RoguelikeTask::RoguelikeTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), m_roguelike_task_ptr(std::make_shared(callback, callback_arg, TaskType)) { diff --git a/src/MeoAssistant/RoguelikeTask.h b/src/MeoAssistant/RoguelikeTask.h index dccb5fbed1..049af9b76b 100644 --- a/src/MeoAssistant/RoguelikeTask.h +++ b/src/MeoAssistant/RoguelikeTask.h @@ -11,7 +11,7 @@ namespace asst class RoguelikeTask : public PackageTask { public: - RoguelikeTask(AsstCallback callback, void* callback_arg); + RoguelikeTask(const AsstCallback& callback, void* callback_arg); virtual ~RoguelikeTask() = default; virtual bool set_params(const json::value& params) override; diff --git a/src/MeoAssistant/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/StageDropsImageAnalyzer.cpp index 2dc37e1a72..6c3781edf7 100644 --- a/src/MeoAssistant/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/StageDropsImageAnalyzer.cpp @@ -391,7 +391,7 @@ std::string asst::StageDropsImageAnalyzer::match_item(const Rect& roi, StageDrop return "4003"; // 合成玉 } - auto match_item_with_templs = [&](std::vector templs_list) -> std::string { + auto match_item_with_templs = [&](const std::vector& templs_list) -> std::string { MatchImageAnalyzer analyzer(m_image); analyzer.set_task_info("StageDrops-Item"); analyzer.set_mask_with_close(true); diff --git a/src/MeoAssistant/StartUpTask.cpp b/src/MeoAssistant/StartUpTask.cpp index 21095a0b11..9c038cf69a 100644 --- a/src/MeoAssistant/StartUpTask.cpp +++ b/src/MeoAssistant/StartUpTask.cpp @@ -1,9 +1,11 @@ #include "StartUpTask.h" +#include + #include "ProcessTask.h" asst::StartUpTask::StartUpTask(AsstCallback callback, void* callback_arg) - : PackageTask(callback, callback_arg, TaskType), + : PackageTask(std::move(callback), callback_arg, TaskType), m_start_game_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)), m_start_up_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)) { diff --git a/src/MeoAssistant/VisitTask.cpp b/src/MeoAssistant/VisitTask.cpp index 4735cee5bb..343fb61274 100644 --- a/src/MeoAssistant/VisitTask.cpp +++ b/src/MeoAssistant/VisitTask.cpp @@ -1,9 +1,11 @@ #include "VisitTask.h" +#include + #include "ProcessTask.h" asst::VisitTask::VisitTask(AsstCallback callback, void* callback_arg) - : PackageTask(callback, callback_arg, TaskType), + : PackageTask(std::move(callback), callback_arg, TaskType), m_visit_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)) { m_visit_task_ptr->set_tasks({ "VisitBegin" });