mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 00:03:03 +04:00
Merge branch 4.x
This commit is contained in:
@@ -670,7 +670,7 @@ bool findChessboardCorners(InputArray image_, Size pattern_size,
|
||||
std::vector<Point2f> out_corners;
|
||||
|
||||
if (is_plain)
|
||||
CV_CheckType(type, depth == CV_8U && cn == 1, "Only 8-bit grayscale images are supported whith CALIB_CB_PLAIN flag enable");
|
||||
CV_CheckType(type, depth == CV_8U && cn == 1, "Only 8-bit grayscale images are supported with CALIB_CB_PLAIN flag enable");
|
||||
|
||||
if (img.channels() != 1)
|
||||
{
|
||||
|
||||
@@ -725,7 +725,7 @@ void FastX::detectImpl(const cv::Mat& _gray_image,
|
||||
// calc images
|
||||
// for each angle step
|
||||
int scale_id = scale-parameters.min_scale;
|
||||
int scale_size = int(pow(2.0,scale+1+super_res));
|
||||
int scale_size = int(std::pow(2,scale+1+super_res));
|
||||
int scale_size2 = int((scale_size/7)*2+1);
|
||||
std::vector<cv::UMat> images;
|
||||
images.resize(2*num);
|
||||
@@ -2242,7 +2242,7 @@ int Chessboard::Board::detectMarkers(cv::InputArray image)
|
||||
cv::bitwise_and(field,mask2,temp);
|
||||
double noise= cv::sum(temp)[0]/noise_size;
|
||||
|
||||
// calc refrence value
|
||||
// calc reference value
|
||||
Cell *cell2 = getCell(y,abs(x-1));
|
||||
src[0] = *cell2->top_left;
|
||||
src[1] = *cell2->top_right;
|
||||
|
||||
Reference in New Issue
Block a user