|
|
|
|
@ -153,11 +153,11 @@ int CameraCheckAnalysisy::Detect_Pre()
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//判断图片左右,0为左,1为右
|
|
|
|
|
bool exchange_img = ifExchange(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B, pImageResult->result->in_shareImage->strCameraName);
|
|
|
|
|
if(exchange_img){
|
|
|
|
|
std::swap(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B);
|
|
|
|
|
}
|
|
|
|
|
// //判断图片左右,0为左,1为右
|
|
|
|
|
// bool exchange_img = ifExchange(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B, pImageResult->result->in_shareImage->strCameraName);
|
|
|
|
|
// if(exchange_img){
|
|
|
|
|
// std::swap(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// printf("===66666666666666666\n");
|
|
|
|
|
// int re = Mergimg(pImageResult->result->in_shareImage->img, pImageResult->result->in_shareImage->img_B,
|
|
|
|
|
@ -182,7 +182,7 @@ int CameraCheckAnalysisy::Detect_Pre()
|
|
|
|
|
|
|
|
|
|
if (pImageResult->result->in_shareImage->Det_Mode == DET_MODE_MergeImg)
|
|
|
|
|
{
|
|
|
|
|
cv::imwrite(pImageResult->result->in_shareImage->strCameraName + "_MergeImg.png", pImageResult->result->in_shareImage->img);
|
|
|
|
|
cv::imwrite(pImageResult->result->in_shareImage->strCameraName + "_MergeImg.jpg", pImageResult->result->in_shareImage->img);
|
|
|
|
|
return 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|