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

fix.修复图片模板越界时的崩溃问题；并添加一些日志

Browse Source 
fix #610
This commit is contained in:
MistEO
2022-05-29 17:15:44 +08:00
parent bf50a61dd1
commit fe74e84161
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MeoAssistant/MatchImageAnalyzer.cpp
View File

@@ -100,6 +100,25 @@ bool asst::MatchImageAnalyzer::match_templ(const cv::Mat templ)
{
cv::Mat matched;
Log.trace(__FUNCTION__, "raw_roi", m_roi.to_string());
if (m_roi.x < 0) {
Log.info(__FUNCTION__, "roi is out of range");
m_roi.x = 0;
}
if (m_roi.y < 0) {
Log.info(__FUNCTION__, "roi is out of range");
m_roi.y = 0;
}
if (m_roi.x + m_roi.width >= m_image.cols) {
Log.info(__FUNCTION__, "roi is out of range");
m_roi.width = m_image.cols - m_roi.x;
}
if (m_roi.y + m_roi.height >= m_image.rows) {
Log.info(__FUNCTION__, "roi is out of range");
m_roi.height = m_image.rows - m_roi.y;
}
cv::Mat image_roi = m_image(utils::make_rect<cv::Rect>(m_roi));
if (templ.cols > image_roi.cols || templ.rows > image_roi.rows) {
Log.error("templ size is too large", m_templ_name,