From ef7793736ea2104c26697439df206f63d0ad41cf Mon Sep 17 00:00:00 2001 From: xiewenji <527774126@qq.com> Date: Mon, 15 Jun 2026 17:57:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=A7=A3=E5=86=B3warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AlgorithmModule/include/CheckUtil.hpp | 6 ++++++ AlgorithmModule/include/DetLog.h | 6 ++++++ AlgorithmModule/src/CameraCheckAnalysisy.cpp | 3 +++ ConfigModule/src/ConfigManager.cpp | 5 +++-- example/deal.cpp | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/AlgorithmModule/include/CheckUtil.hpp b/AlgorithmModule/include/CheckUtil.hpp index 51e9f2e..df240f3 100644 --- a/AlgorithmModule/include/CheckUtil.hpp +++ b/AlgorithmModule/include/CheckUtil.hpp @@ -64,6 +64,12 @@ public: static int cutSmallImg(cv::Mat img, std::vector &samllRoiList, cv::Rect config_roi, int config_SmallImg_Width, int config_SmallImg_Height, int config_MinOverlap_Width, int config_MinOverlap_Height); static cv::Point2f transformPoint(const cv::Point2f &point, const cv::Mat &transform_matrix); }; +// 无参数重载:直接返回原字符串,避免 -Wformat-security 警告 +static inline std::string str_Format(const std::string &format) +{ + return format; +} + template static std::string str_Format(const std::string &format, Args... args) { diff --git a/AlgorithmModule/include/DetLog.h b/AlgorithmModule/include/DetLog.h index b8f53c1..dacd356 100644 --- a/AlgorithmModule/include/DetLog.h +++ b/AlgorithmModule/include/DetLog.h @@ -25,6 +25,12 @@ enum PrintLevel_ PrintLevel_3, PrintLevel_4, }; +// 无参数重载:直接返回原字符串,避免 -Wformat-security 警告 +inline std::string str_Format_1(const std::string &format) +{ + return format; +} + template std::string str_Format_1(const std::string &format, Args... args) { diff --git a/AlgorithmModule/src/CameraCheckAnalysisy.cpp b/AlgorithmModule/src/CameraCheckAnalysisy.cpp index b2ba43d..bc36188 100644 --- a/AlgorithmModule/src/CameraCheckAnalysisy.cpp +++ b/AlgorithmModule/src/CameraCheckAnalysisy.cpp @@ -96,6 +96,9 @@ string JudgeMaterialPosition(Mat img) { } else if (left_black_count > right_black_count) { return "Right"; } + else{ + return "Unknown"; + } } //正常情况CA(img物料在左,img_B物料在右),TA(img物料在右,img_B物料在左) diff --git a/ConfigModule/src/ConfigManager.cpp b/ConfigModule/src/ConfigManager.cpp index af3d0cf..4750763 100644 --- a/ConfigModule/src/ConfigManager.cpp +++ b/ConfigModule/src/ConfigManager.cpp @@ -113,14 +113,15 @@ int ReadFlawCodeConfig(std::string json_path) int ConfigManager::LoadParamConfig(std::shared_ptr &Config, std::string strConfigPath) { - Json::Reader json_reader; + Json::CharReaderBuilder builder; Json::Value json_value; + std::string errs; std::ifstream infile(strConfigPath, ios::binary); printf("Analysis_Config_path========== %s \n", strConfigPath.c_str()); // getchar(); if (infile.is_open()) { - if (json_reader.parse(infile, json_value)) + if (Json::parseFromStream(builder, infile, &json_value, &errs)) { Config->UpdateJSONConfig((void *)&json_value, ConfigType_Analysisy_Common_XL); diff --git a/example/deal.cpp b/example/deal.cpp index 151844c..d92f678 100644 --- a/example/deal.cpp +++ b/example/deal.cpp @@ -432,7 +432,7 @@ int deal::preCheck() } if (dfe.m_product_Camera_List.size() <= 0) { - printf("error m_product_Camera_List.size() %d \n", dfe.m_product_Camera_List.size()); + printf("error m_product_Camera_List.size() %ld \n", dfe.m_product_Camera_List.size()); return -1; } int idx = 0;