mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixs several problems found by static analysis

Browse Source
This commit is contained in:
Maksim Shabunin 2020-03-16 15:49:51 +03:00
parent 2a52e44bc6
commit 7e7bb3027c
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/calib3d/src/chessboard.cpp
View File

@ -2215,11 +2215,13 @@ int Chessboard::Board::detectMarkers(cv::InputArray image)
cv::Mat mask = cv::Mat::zeros(DUMMY_FIELD_SIZE,DUMMY_FIELD_SIZE,CV_8UC1); cv::Mat mask = cv::Mat::zeros(DUMMY_FIELD_SIZE,DUMMY_FIELD_SIZE,CV_8UC1);
cv::circle(mask,cv::Point(DUMMY_FIELD_SIZE/2,DUMMY_FIELD_SIZE/2),DUMMY_FIELD_SIZE/7,cv::Scalar::all(255),-1); cv::circle(mask,cv::Point(DUMMY_FIELD_SIZE/2,DUMMY_FIELD_SIZE/2),DUMMY_FIELD_SIZE/7,cv::Scalar::all(255),-1);
int signal_size = cv::countNonZero(mask); int signal_size = cv::countNonZero(mask);
CV_Assert(signal_size > 0);
cv::Mat mask2 = cv::Mat::zeros(DUMMY_FIELD_SIZE,DUMMY_FIELD_SIZE,CV_8UC1); cv::Mat mask2 = cv::Mat::zeros(DUMMY_FIELD_SIZE,DUMMY_FIELD_SIZE,CV_8UC1);
cv::circle(mask2,cv::Point(DUMMY_FIELD_SIZE/2,DUMMY_FIELD_SIZE/2),DUMMY_FIELD_SIZE/2,cv::Scalar::all(255),-1); cv::circle(mask2,cv::Point(DUMMY_FIELD_SIZE/2,DUMMY_FIELD_SIZE/2),DUMMY_FIELD_SIZE/2,cv::Scalar::all(255),-1);
cv::circle(mask2,cv::Point(DUMMY_FIELD_SIZE/2,DUMMY_FIELD_SIZE/2),DUMMY_FIELD_SIZE/5,cv::Scalar::all(0),-1); cv::circle(mask2,cv::Point(DUMMY_FIELD_SIZE/2,DUMMY_FIELD_SIZE/2),DUMMY_FIELD_SIZE/5,cv::Scalar::all(0),-1);
int noise_size = cv::countNonZero(mask2); int noise_size = cv::countNonZero(mask2);
CV_Assert(noise_size > 0);
std::vector<cv::Point2f> dst,src; std::vector<cv::Point2f> dst,src;
dst.push_back(cv::Point2f(0.0F,0.0F)); dst.push_back(cv::Point2f(0.0F,0.0F));
@ -3369,7 +3371,7 @@ cv::Scalar Chessboard::Board::calcEdgeSharpness(cv::InputArray _img,float rise_d
value += patch.at<uint8_t>(0,0); value += patch.at<uint8_t>(0,0);
++count2; ++count2;
} }
values.push_back(uint8_t(value/count2)); values.push_back(count2 > 0 ? uint8_t(value/count2) : 0);
} }
float val = calcSharpness(values,rise_distance); float val = calcSharpness(values,rise_distance);

1
modules/core/src/persistence.cpp
View File

@ -704,6 +704,7 @@ public:
const char* json_signature = "{"; const char* json_signature = "{";
const char* xml_signature = "<?xml"; const char* xml_signature = "<?xml";
char* buf = this->gets(16); char* buf = this->gets(16);
CV_Assert(buf);
char* bufPtr = cv_skip_BOM(buf); char* bufPtr = cv_skip_BOM(buf);
size_t bufOffset = bufPtr - buf; size_t bufOffset = bufPtr - buf;

1
modules/features2d/src/kaze/AKAZEFeatures.cpp
View File

@ -1323,6 +1323,7 @@ void quantized_counting_sort(const float a[], const int n,
const float quantum, const int nkeys, const float quantum, const int nkeys,
int idx[/*n*/], int cum[/*nkeys + 1*/]) int idx[/*n*/], int cum[/*nkeys + 1*/])
{ {
CV_Assert(nkeys > 0);
memset(cum, 0, sizeof(cum[0]) * (nkeys + 1)); memset(cum, 0, sizeof(cum[0]) * (nkeys + 1));
// Count up the quantized values // Count up the quantized values

2
modules/objdetect/src/qrcode.cpp
View File

@ -1593,6 +1593,8 @@ bool QRDetectMulti::checkPoints(const vector<Point2f>& quadrangle_points)
li2++; li2++;
} }
} }
if (count_w == 0)
return false;
double frac = double(count_b) / double(count_w); double frac = double(count_b) / double(count_w);
double bottom_bound = 0.76; double bottom_bound = 0.76;