From 5c8eb11033b8dbb33e558ee5b851a8a9631e2254 Mon Sep 17 00:00:00 2001 From: RCi <15089880081@163.com> Date: Thu, 30 Oct 2025 15:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=9B=B8=E6=9C=BA=E8=A1=A5?= =?UTF-8?q?=E5=9B=BE=E4=B8=BA=E8=A1=A5=E5=8D=95=E9=80=9A=E9=81=93=E9=BB=91?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Hd_CameraModule_3DKeyence/Hd_CameraModule_3DKeyence.cpp | 4 ++-- .../Hd_CameraModule_HIK_hard_GIGE.cpp | 2 +- .../Hd_CameraModule_HIK_hard_PCIE.cpp | 2 +- .../Hd_CameraModule_HIK_hard_USB.cpp | 2 +- .../Hd_CameraModule_HIK_soft_GIGE.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/subModule/Hd_CameraModule_3DKeyence/Hd_CameraModule_3DKeyence.cpp b/subModule/Hd_CameraModule_3DKeyence/Hd_CameraModule_3DKeyence.cpp index 526ea93..312c97b 100644 --- a/subModule/Hd_CameraModule_3DKeyence/Hd_CameraModule_3DKeyence.cpp +++ b/subModule/Hd_CameraModule_3DKeyence/Hd_CameraModule_3DKeyence.cpp @@ -277,8 +277,8 @@ bool Hd_CameraModule_3DKeyence::readData(std::vector &mats,QByteArray & mats.push_back(heightMatS.dequeue()); } else { - mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0, 0, 0))); - mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0, 0, 0))); + mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0))); + mats.push_back(cv::Mat(G_xImageSize, G_yImageSize, CV_8UC1, cv::Scalar(0))); } } imgTakeNum = 0; diff --git a/subModule/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp b/subModule/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp index 748fc76..3789fba 100644 --- a/subModule/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp +++ b/subModule/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp @@ -557,7 +557,7 @@ bool Hd_CameraModule_HIK_hard_PCIE::run() break; } if (cnt > 120) { - queuepic.push_back(cv::Mat(250, 250, CV_8UC3, cv::Scalar(0, 255, 0))); //返回空图 + queuepic.push_back(cv::Mat(200, 200, CV_8UC1, cv::Scalar(0))); //返回空图 std::cout << "timeout" << std::endl; n_mutex->unlock(); return true; diff --git a/subModule/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp b/subModule/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp index 074e3dd..d4fb21a 100644 --- a/subModule/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp +++ b/subModule/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp @@ -536,7 +536,7 @@ bool Hd_CameraModule_HIK_hard_PCIE::run() if (cnt > 150) { n_mutex->lock(); //queuepic.push_back(cv::imread("D://Image_20250809202445856.bmp", -1)); - queuepic.push_back(cv::Mat(200, 200, CV_8UC3, cv::Scalar(0, 255, 0))); //返回空图 + queuepic.push_back(cv::Mat(200, 200, CV_8UC1, cv::Scalar(0))); //返回空图 std::cout << "timeout" << std::endl; n_mutex->unlock(); return true; diff --git a/subModule/Hd_CameraModule_HIK_hard_USB/Hd_CameraModule_HIK_hard_USB.cpp b/subModule/Hd_CameraModule_HIK_hard_USB/Hd_CameraModule_HIK_hard_USB.cpp index 9014aa4..679fdfa 100644 --- a/subModule/Hd_CameraModule_HIK_hard_USB/Hd_CameraModule_HIK_hard_USB.cpp +++ b/subModule/Hd_CameraModule_HIK_hard_USB/Hd_CameraModule_HIK_hard_USB.cpp @@ -682,7 +682,7 @@ bool Hd_CameraModule_HIK_hard_USB::run() break; } if (cnt > 150) { - queuepic.push_back(cv::Mat(200, 200, CV_8UC3, cv::Scalar(0, 255, 0))); //返回空图 + queuepic.push_back(cv::Mat(200, 200, CV_8UC1, cv::Scalar(0))); //返回空图 std::cout << "timeout" << std::endl; n_mutex->unlock(); return true; diff --git a/subModule/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp b/subModule/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp index 21b867a..9391dbb 100644 --- a/subModule/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp +++ b/subModule/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp @@ -562,7 +562,7 @@ bool Hd_CameraModule_HIK_soft_GIGE::run() break; } if (cnt > 120) { - queuepic.push_back(cv::Mat(250, 250, CV_8UC3, cv::Scalar(0, 255, 0))); //返回空图 + queuepic.push_back(cv::Mat(200, 200, CV_8UC1, cv::Scalar(0))); //返回空图 std::cout << "timeout" << std::endl; n_mutex->unlock(); return true;