Normalize line endings and whitespace
This commit is contained in:
OpenCV Buildbot
committed by
Andrey Kamaev
Andrey Kamaev
parent
0442bca235
commit
81f826db2b
@@ -47,32 +47,32 @@ public:
|
||||
CV_UndistortPointsBadArgTest();
|
||||
protected:
|
||||
void run(int);
|
||||
void run_func();
|
||||
void run_func();
|
||||
|
||||
private:
|
||||
//common
|
||||
cv::Size img_size;
|
||||
bool useCPlus;
|
||||
//static const int N_POINTS = 1;
|
||||
static const int N_POINTS2 = 2;
|
||||
//common
|
||||
cv::Size img_size;
|
||||
bool useCPlus;
|
||||
//static const int N_POINTS = 1;
|
||||
static const int N_POINTS2 = 2;
|
||||
|
||||
//C
|
||||
CvMat* _camera_mat;
|
||||
CvMat* matR;
|
||||
CvMat* matP;
|
||||
CvMat* _distortion_coeffs;
|
||||
CvMat* _src_points;
|
||||
CvMat* _dst_points;
|
||||
//C
|
||||
CvMat* _camera_mat;
|
||||
CvMat* matR;
|
||||
CvMat* matP;
|
||||
CvMat* _distortion_coeffs;
|
||||
CvMat* _src_points;
|
||||
CvMat* _dst_points;
|
||||
|
||||
|
||||
//C++
|
||||
cv::Mat camera_mat;
|
||||
cv::Mat R;
|
||||
cv::Mat P;
|
||||
cv::Mat distortion_coeffs;
|
||||
cv::Mat src_points;
|
||||
std::vector<cv::Point2f> dst_points;
|
||||
|
||||
//C++
|
||||
cv::Mat camera_mat;
|
||||
cv::Mat R;
|
||||
cv::Mat P;
|
||||
cv::Mat distortion_coeffs;
|
||||
cv::Mat src_points;
|
||||
std::vector<cv::Point2f> dst_points;
|
||||
|
||||
};
|
||||
|
||||
CV_UndistortPointsBadArgTest::CV_UndistortPointsBadArgTest ()
|
||||
@@ -81,196 +81,196 @@ CV_UndistortPointsBadArgTest::CV_UndistortPointsBadArgTest ()
|
||||
|
||||
void CV_UndistortPointsBadArgTest::run_func()
|
||||
{
|
||||
if (useCPlus)
|
||||
{
|
||||
cv::undistortPoints(src_points,dst_points,camera_mat,distortion_coeffs,R,P);
|
||||
}
|
||||
else
|
||||
{
|
||||
cvUndistortPoints(_src_points,_dst_points,_camera_mat,_distortion_coeffs,matR,matP);
|
||||
}
|
||||
if (useCPlus)
|
||||
{
|
||||
cv::undistortPoints(src_points,dst_points,camera_mat,distortion_coeffs,R,P);
|
||||
}
|
||||
else
|
||||
{
|
||||
cvUndistortPoints(_src_points,_dst_points,_camera_mat,_distortion_coeffs,matR,matP);
|
||||
}
|
||||
}
|
||||
|
||||
void CV_UndistortPointsBadArgTest::run(int)
|
||||
{
|
||||
//RNG& rng = ts->get_rng();
|
||||
int errcount = 0;
|
||||
useCPlus = false;
|
||||
//RNG& rng = ts->get_rng();
|
||||
int errcount = 0;
|
||||
useCPlus = false;
|
||||
//initializing
|
||||
img_size.width = 800;
|
||||
img_size.height = 600;
|
||||
double cam[9] = {150.f, 0.f, img_size.width/2.f, 0, 300.f, img_size.height/2.f, 0.f, 0.f, 1.f};
|
||||
double dist[4] = {0.01,0.02,0.001,0.0005};
|
||||
double s_points[N_POINTS2] = {img_size.width/4,img_size.height/4};
|
||||
double d_points[N_POINTS2];
|
||||
double p[9] = {155.f, 0.f, img_size.width/2.f+img_size.width/50.f, 0, 310.f, img_size.height/2.f+img_size.height/50.f, 0.f, 0.f, 1.f};
|
||||
double r[9] = {1,0,0,0,1,0,0,0,1};
|
||||
img_size.width = 800;
|
||||
img_size.height = 600;
|
||||
double cam[9] = {150.f, 0.f, img_size.width/2.f, 0, 300.f, img_size.height/2.f, 0.f, 0.f, 1.f};
|
||||
double dist[4] = {0.01,0.02,0.001,0.0005};
|
||||
double s_points[N_POINTS2] = {img_size.width/4,img_size.height/4};
|
||||
double d_points[N_POINTS2];
|
||||
double p[9] = {155.f, 0.f, img_size.width/2.f+img_size.width/50.f, 0, 310.f, img_size.height/2.f+img_size.height/50.f, 0.f, 0.f, 1.f};
|
||||
double r[9] = {1,0,0,0,1,0,0,0,1};
|
||||
|
||||
CvMat _camera_mat_orig = cvMat(3,3,CV_64F,cam);
|
||||
CvMat _distortion_coeffs_orig = cvMat(1,4,CV_64F,dist);
|
||||
CvMat _P_orig = cvMat(3,3,CV_64F,p);
|
||||
CvMat _R_orig = cvMat(3,3,CV_64F,r);
|
||||
CvMat _src_points_orig = cvMat(1,4,CV_64FC2,s_points);
|
||||
CvMat _dst_points_orig = cvMat(1,4,CV_64FC2,d_points);
|
||||
CvMat _camera_mat_orig = cvMat(3,3,CV_64F,cam);
|
||||
CvMat _distortion_coeffs_orig = cvMat(1,4,CV_64F,dist);
|
||||
CvMat _P_orig = cvMat(3,3,CV_64F,p);
|
||||
CvMat _R_orig = cvMat(3,3,CV_64F,r);
|
||||
CvMat _src_points_orig = cvMat(1,4,CV_64FC2,s_points);
|
||||
CvMat _dst_points_orig = cvMat(1,4,CV_64FC2,d_points);
|
||||
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
matP = &_P_orig;
|
||||
matR = &_R_orig;
|
||||
_src_points = &_src_points_orig;
|
||||
_dst_points = &_dst_points_orig;
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
matP = &_P_orig;
|
||||
matR = &_R_orig;
|
||||
_src_points = &_src_points_orig;
|
||||
_dst_points = &_dst_points_orig;
|
||||
|
||||
//tests
|
||||
CvMat* temp1;
|
||||
CvMat* temp;
|
||||
IplImage* temp_img = cvCreateImage(cvSize(img_size.width,img_size.height),8,3);
|
||||
CvMat* temp1;
|
||||
CvMat* temp;
|
||||
IplImage* temp_img = cvCreateImage(cvSize(img_size.width,img_size.height),8,3);
|
||||
|
||||
//-----------
|
||||
temp = (CvMat*)temp_img;
|
||||
_src_points = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Input data is not CvMat*" );
|
||||
_src_points = &_src_points_orig;
|
||||
temp = (CvMat*)temp_img;
|
||||
_src_points = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Input data is not CvMat*" );
|
||||
_src_points = &_src_points_orig;
|
||||
|
||||
temp = (CvMat*)temp_img;
|
||||
_dst_points = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Output data is not CvMat*" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
temp = (CvMat*)temp_img;
|
||||
_dst_points = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Output data is not CvMat*" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
|
||||
temp = cvCreateMat(2,3,CV_64F);
|
||||
_src_points = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid input data matrix size" );
|
||||
_src_points = &_src_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(2,3,CV_64F);
|
||||
_src_points = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid input data matrix size" );
|
||||
_src_points = &_src_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(2,3,CV_64F);
|
||||
_dst_points = temp;
|
||||
errcount += run_test_case(CV_StsAssert, "Invalid output data matrix size" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(2,3,CV_64F);
|
||||
_dst_points = temp;
|
||||
errcount += run_test_case(CV_StsAssert, "Invalid output data matrix size" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(1,3,CV_64F);
|
||||
temp1 = cvCreateMat(4,1,CV_64F);
|
||||
_dst_points = temp;
|
||||
_src_points = temp1;
|
||||
errcount += run_test_case(CV_StsAssert, "Output and input data sizes mismatch" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
_src_points = &_src_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
cvReleaseMat(&temp1);
|
||||
temp = cvCreateMat(1,3,CV_64F);
|
||||
temp1 = cvCreateMat(4,1,CV_64F);
|
||||
_dst_points = temp;
|
||||
_src_points = temp1;
|
||||
errcount += run_test_case(CV_StsAssert, "Output and input data sizes mismatch" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
_src_points = &_src_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
cvReleaseMat(&temp1);
|
||||
|
||||
temp = cvCreateMat(1,3,CV_32S);
|
||||
_dst_points = temp;
|
||||
errcount += run_test_case(CV_StsAssert, "Invalid output data matrix type" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(1,3,CV_32S);
|
||||
_dst_points = temp;
|
||||
errcount += run_test_case(CV_StsAssert, "Invalid output data matrix type" );
|
||||
_dst_points = &_dst_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(1,3,CV_32S);
|
||||
_src_points = temp;
|
||||
errcount += run_test_case(CV_StsAssert, "Invalid input data matrix type" );
|
||||
_src_points = &_src_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(1,3,CV_32S);
|
||||
_src_points = temp;
|
||||
errcount += run_test_case(CV_StsAssert, "Invalid input data matrix type" );
|
||||
_src_points = &_src_points_orig;
|
||||
cvReleaseMat(&temp);
|
||||
//------------
|
||||
temp = cvCreateMat(2,3,CV_64F);
|
||||
_camera_mat = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid camera data matrix size" );
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(2,3,CV_64F);
|
||||
_camera_mat = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid camera data matrix size" );
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(3,4,CV_64F);
|
||||
_camera_mat = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid camera data matrix size" );
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(3,4,CV_64F);
|
||||
_camera_mat = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid camera data matrix size" );
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = (CvMat*)temp_img;
|
||||
_camera_mat = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Camera data is not CvMat*" );
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
temp = (CvMat*)temp_img;
|
||||
_camera_mat = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Camera data is not CvMat*" );
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
//----------
|
||||
|
||||
temp = (CvMat*)temp_img;
|
||||
_distortion_coeffs = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Distortion coefficients data is not CvMat*" );
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
temp = (CvMat*)temp_img;
|
||||
_distortion_coeffs = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Distortion coefficients data is not CvMat*" );
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
|
||||
temp = cvCreateMat(1,6,CV_64F);
|
||||
_distortion_coeffs = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid distortion coefficients data matrix size" );
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(1,6,CV_64F);
|
||||
_distortion_coeffs = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid distortion coefficients data matrix size" );
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(3,3,CV_64F);
|
||||
_distortion_coeffs = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid distortion coefficients data matrix size" );
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(3,3,CV_64F);
|
||||
_distortion_coeffs = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid distortion coefficients data matrix size" );
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
cvReleaseMat(&temp);
|
||||
//----------
|
||||
temp = (CvMat*)temp_img;
|
||||
matR = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "R data is not CvMat*" );
|
||||
matR = &_R_orig;
|
||||
temp = (CvMat*)temp_img;
|
||||
matR = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "R data is not CvMat*" );
|
||||
matR = &_R_orig;
|
||||
|
||||
temp = cvCreateMat(4,3,CV_64F);
|
||||
matR = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid R data matrix size" );
|
||||
matR = &_R_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(4,3,CV_64F);
|
||||
matR = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid R data matrix size" );
|
||||
matR = &_R_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(3,2,CV_64F);
|
||||
matR = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid R data matrix size" );
|
||||
matR = &_R_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(3,2,CV_64F);
|
||||
matR = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid R data matrix size" );
|
||||
matR = &_R_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
//-----------
|
||||
temp = (CvMat*)temp_img;
|
||||
matP = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "P data is not CvMat*" );
|
||||
matP = &_P_orig;
|
||||
temp = (CvMat*)temp_img;
|
||||
matP = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "P data is not CvMat*" );
|
||||
matP = &_P_orig;
|
||||
|
||||
temp = cvCreateMat(4,3,CV_64F);
|
||||
matP = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid P data matrix size" );
|
||||
matP = &_P_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(4,3,CV_64F);
|
||||
matP = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid P data matrix size" );
|
||||
matP = &_P_orig;
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(3,2,CV_64F);
|
||||
matP = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid P data matrix size" );
|
||||
matP = &_P_orig;
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(3,2,CV_64F);
|
||||
matP = temp;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid P data matrix size" );
|
||||
matP = &_P_orig;
|
||||
cvReleaseMat(&temp);
|
||||
//------------
|
||||
//C++ tests
|
||||
useCPlus = true;
|
||||
//C++ tests
|
||||
useCPlus = true;
|
||||
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
P = cv::Mat(&_P_orig);
|
||||
R = cv::Mat(&_R_orig);
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
P = cv::Mat(&_P_orig);
|
||||
R = cv::Mat(&_R_orig);
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
|
||||
temp = cvCreateMat(2,2,CV_32FC2);
|
||||
src_points = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid input data matrix size" );
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(2,2,CV_32FC2);
|
||||
src_points = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid input data matrix size" );
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(1,4,CV_64FC2);
|
||||
src_points = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid input data matrix type" );
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(1,4,CV_64FC2);
|
||||
src_points = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid input data matrix type" );
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
src_points = cv::Mat();
|
||||
errcount += run_test_case( CV_StsAssert, "Input data matrix is not continuous" );
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
cvReleaseMat(&temp);
|
||||
src_points = cv::Mat();
|
||||
errcount += run_test_case( CV_StsAssert, "Input data matrix is not continuous" );
|
||||
src_points = cv::Mat(&_src_points_orig);
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
|
||||
|
||||
//------------
|
||||
cvReleaseImage(&temp_img);
|
||||
ts->set_failed_test_info(errcount > 0 ? cvtest::TS::FAIL_BAD_ARG_CHECK : cvtest::TS::OK);
|
||||
cvReleaseImage(&temp_img);
|
||||
ts->set_failed_test_info(errcount > 0 ? cvtest::TS::FAIL_BAD_ARG_CHECK : cvtest::TS::OK);
|
||||
}
|
||||
|
||||
|
||||
@@ -281,31 +281,31 @@ public:
|
||||
CV_InitUndistortRectifyMapBadArgTest();
|
||||
protected:
|
||||
void run(int);
|
||||
void run_func();
|
||||
void run_func();
|
||||
|
||||
private:
|
||||
//common
|
||||
cv::Size img_size;
|
||||
bool useCPlus;
|
||||
//common
|
||||
cv::Size img_size;
|
||||
bool useCPlus;
|
||||
|
||||
//C
|
||||
CvMat* _camera_mat;
|
||||
CvMat* matR;
|
||||
CvMat* _new_camera_mat;
|
||||
CvMat* _distortion_coeffs;
|
||||
CvMat* _mapx;
|
||||
CvMat* _mapy;
|
||||
|
||||
//C
|
||||
CvMat* _camera_mat;
|
||||
CvMat* matR;
|
||||
CvMat* _new_camera_mat;
|
||||
CvMat* _distortion_coeffs;
|
||||
CvMat* _mapx;
|
||||
CvMat* _mapy;
|
||||
|
||||
|
||||
//C++
|
||||
cv::Mat camera_mat;
|
||||
cv::Mat R;
|
||||
cv::Mat new_camera_mat;
|
||||
cv::Mat distortion_coeffs;
|
||||
cv::Mat mapx;
|
||||
cv::Mat mapy;
|
||||
int mat_type;
|
||||
|
||||
//C++
|
||||
cv::Mat camera_mat;
|
||||
cv::Mat R;
|
||||
cv::Mat new_camera_mat;
|
||||
cv::Mat distortion_coeffs;
|
||||
cv::Mat mapx;
|
||||
cv::Mat mapy;
|
||||
int mat_type;
|
||||
|
||||
};
|
||||
|
||||
CV_InitUndistortRectifyMapBadArgTest::CV_InitUndistortRectifyMapBadArgTest ()
|
||||
@@ -314,86 +314,86 @@ CV_InitUndistortRectifyMapBadArgTest::CV_InitUndistortRectifyMapBadArgTest ()
|
||||
|
||||
void CV_InitUndistortRectifyMapBadArgTest::run_func()
|
||||
{
|
||||
if (useCPlus)
|
||||
{
|
||||
cv::initUndistortRectifyMap(camera_mat,distortion_coeffs,R,new_camera_mat,img_size,mat_type,mapx,mapy);
|
||||
}
|
||||
else
|
||||
{
|
||||
cvInitUndistortRectifyMap(_camera_mat,_distortion_coeffs,matR,_new_camera_mat,_mapx,_mapy);
|
||||
}
|
||||
if (useCPlus)
|
||||
{
|
||||
cv::initUndistortRectifyMap(camera_mat,distortion_coeffs,R,new_camera_mat,img_size,mat_type,mapx,mapy);
|
||||
}
|
||||
else
|
||||
{
|
||||
cvInitUndistortRectifyMap(_camera_mat,_distortion_coeffs,matR,_new_camera_mat,_mapx,_mapy);
|
||||
}
|
||||
}
|
||||
|
||||
void CV_InitUndistortRectifyMapBadArgTest::run(int)
|
||||
{
|
||||
int errcount = 0;
|
||||
int errcount = 0;
|
||||
//initializing
|
||||
img_size.width = 800;
|
||||
img_size.height = 600;
|
||||
double cam[9] = {150.f, 0.f, img_size.width/2.f, 0, 300.f, img_size.height/2.f, 0.f, 0.f, 1.f};
|
||||
double dist[4] = {0.01,0.02,0.001,0.0005};
|
||||
float* arr_mapx = new float[img_size.width*img_size.height];
|
||||
float* arr_mapy = new float[img_size.width*img_size.height];
|
||||
double arr_new_camera_mat[9] = {155.f, 0.f, img_size.width/2.f+img_size.width/50.f, 0, 310.f, img_size.height/2.f+img_size.height/50.f, 0.f, 0.f, 1.f};
|
||||
double r[9] = {1,0,0,0,1,0,0,0,1};
|
||||
img_size.width = 800;
|
||||
img_size.height = 600;
|
||||
double cam[9] = {150.f, 0.f, img_size.width/2.f, 0, 300.f, img_size.height/2.f, 0.f, 0.f, 1.f};
|
||||
double dist[4] = {0.01,0.02,0.001,0.0005};
|
||||
float* arr_mapx = new float[img_size.width*img_size.height];
|
||||
float* arr_mapy = new float[img_size.width*img_size.height];
|
||||
double arr_new_camera_mat[9] = {155.f, 0.f, img_size.width/2.f+img_size.width/50.f, 0, 310.f, img_size.height/2.f+img_size.height/50.f, 0.f, 0.f, 1.f};
|
||||
double r[9] = {1,0,0,0,1,0,0,0,1};
|
||||
|
||||
CvMat _camera_mat_orig = cvMat(3,3,CV_64F,cam);
|
||||
CvMat _distortion_coeffs_orig = cvMat(1,4,CV_64F,dist);
|
||||
CvMat _new_camera_mat_orig = cvMat(3,3,CV_64F,arr_new_camera_mat);
|
||||
CvMat _R_orig = cvMat(3,3,CV_64F,r);
|
||||
CvMat _mapx_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_mapx);
|
||||
CvMat _mapy_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_mapy);
|
||||
int mat_type_orig = CV_32FC1;
|
||||
CvMat _camera_mat_orig = cvMat(3,3,CV_64F,cam);
|
||||
CvMat _distortion_coeffs_orig = cvMat(1,4,CV_64F,dist);
|
||||
CvMat _new_camera_mat_orig = cvMat(3,3,CV_64F,arr_new_camera_mat);
|
||||
CvMat _R_orig = cvMat(3,3,CV_64F,r);
|
||||
CvMat _mapx_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_mapx);
|
||||
CvMat _mapy_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_mapy);
|
||||
int mat_type_orig = CV_32FC1;
|
||||
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
_new_camera_mat = &_new_camera_mat_orig;
|
||||
matR = &_R_orig;
|
||||
_mapx = &_mapx_orig;
|
||||
_mapy = &_mapy_orig;
|
||||
mat_type = mat_type_orig;
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
_new_camera_mat = &_new_camera_mat_orig;
|
||||
matR = &_R_orig;
|
||||
_mapx = &_mapx_orig;
|
||||
_mapy = &_mapy_orig;
|
||||
mat_type = mat_type_orig;
|
||||
|
||||
//tests
|
||||
useCPlus = true;
|
||||
CvMat* temp;
|
||||
useCPlus = true;
|
||||
CvMat* temp;
|
||||
|
||||
//C++ tests
|
||||
useCPlus = true;
|
||||
//C++ tests
|
||||
useCPlus = true;
|
||||
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
new_camera_mat = cv::Mat(&_new_camera_mat_orig);
|
||||
R = cv::Mat(&_R_orig);
|
||||
mapx = cv::Mat(&_mapx_orig);
|
||||
mapy = cv::Mat(&_mapy_orig);
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
new_camera_mat = cv::Mat(&_new_camera_mat_orig);
|
||||
R = cv::Mat(&_R_orig);
|
||||
mapx = cv::Mat(&_mapx_orig);
|
||||
mapy = cv::Mat(&_mapy_orig);
|
||||
|
||||
|
||||
mat_type = CV_64F;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid map matrix type" );
|
||||
mat_type = mat_type_orig;
|
||||
mat_type = CV_64F;
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid map matrix type" );
|
||||
mat_type = mat_type_orig;
|
||||
|
||||
temp = cvCreateMat(3,2,CV_32FC1);
|
||||
camera_mat = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid camera data matrix size" );
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(3,2,CV_32FC1);
|
||||
camera_mat = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid camera data matrix size" );
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(4,3,CV_32FC1);
|
||||
R = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid R data matrix size" );
|
||||
R = cv::Mat(&_R_orig);
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(4,3,CV_32FC1);
|
||||
R = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid R data matrix size" );
|
||||
R = cv::Mat(&_R_orig);
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
temp = cvCreateMat(6,1,CV_32FC1);
|
||||
distortion_coeffs = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid distortion coefficients data matrix size" );
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
cvReleaseMat(&temp);
|
||||
temp = cvCreateMat(6,1,CV_32FC1);
|
||||
distortion_coeffs = cv::Mat(temp);
|
||||
errcount += run_test_case( CV_StsAssert, "Invalid distortion coefficients data matrix size" );
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
cvReleaseMat(&temp);
|
||||
|
||||
//------------
|
||||
delete[] arr_mapx;
|
||||
delete[] arr_mapy;
|
||||
ts->set_failed_test_info(errcount > 0 ? cvtest::TS::FAIL_BAD_ARG_CHECK : cvtest::TS::OK);
|
||||
delete[] arr_mapx;
|
||||
delete[] arr_mapy;
|
||||
ts->set_failed_test_info(errcount > 0 ? cvtest::TS::FAIL_BAD_ARG_CHECK : cvtest::TS::OK);
|
||||
}
|
||||
|
||||
|
||||
@@ -404,28 +404,28 @@ public:
|
||||
CV_UndistortBadArgTest();
|
||||
protected:
|
||||
void run(int);
|
||||
void run_func();
|
||||
void run_func();
|
||||
|
||||
private:
|
||||
//common
|
||||
cv::Size img_size;
|
||||
bool useCPlus;
|
||||
//common
|
||||
cv::Size img_size;
|
||||
bool useCPlus;
|
||||
|
||||
//C
|
||||
CvMat* _camera_mat;
|
||||
CvMat* _new_camera_mat;
|
||||
CvMat* _distortion_coeffs;
|
||||
CvMat* _src;
|
||||
CvMat* _dst;
|
||||
|
||||
//C
|
||||
CvMat* _camera_mat;
|
||||
CvMat* _new_camera_mat;
|
||||
CvMat* _distortion_coeffs;
|
||||
CvMat* _src;
|
||||
CvMat* _dst;
|
||||
|
||||
|
||||
//C++
|
||||
cv::Mat camera_mat;
|
||||
cv::Mat new_camera_mat;
|
||||
cv::Mat distortion_coeffs;
|
||||
cv::Mat src;
|
||||
cv::Mat dst;
|
||||
|
||||
//C++
|
||||
cv::Mat camera_mat;
|
||||
cv::Mat new_camera_mat;
|
||||
cv::Mat distortion_coeffs;
|
||||
cv::Mat src;
|
||||
cv::Mat dst;
|
||||
|
||||
};
|
||||
|
||||
CV_UndistortBadArgTest::CV_UndistortBadArgTest ()
|
||||
@@ -434,81 +434,81 @@ CV_UndistortBadArgTest::CV_UndistortBadArgTest ()
|
||||
|
||||
void CV_UndistortBadArgTest::run_func()
|
||||
{
|
||||
if (useCPlus)
|
||||
{
|
||||
cv::undistort(src,dst,camera_mat,distortion_coeffs,new_camera_mat);
|
||||
}
|
||||
else
|
||||
{
|
||||
cvUndistort2(_src,_dst,_camera_mat,_distortion_coeffs,_new_camera_mat);
|
||||
}
|
||||
if (useCPlus)
|
||||
{
|
||||
cv::undistort(src,dst,camera_mat,distortion_coeffs,new_camera_mat);
|
||||
}
|
||||
else
|
||||
{
|
||||
cvUndistort2(_src,_dst,_camera_mat,_distortion_coeffs,_new_camera_mat);
|
||||
}
|
||||
}
|
||||
|
||||
void CV_UndistortBadArgTest::run(int)
|
||||
{
|
||||
int errcount = 0;
|
||||
int errcount = 0;
|
||||
//initializing
|
||||
img_size.width = 800;
|
||||
img_size.height = 600;
|
||||
double cam[9] = {150.f, 0.f, img_size.width/2.f, 0, 300.f, img_size.height/2.f, 0.f, 0.f, 1.f};
|
||||
double dist[4] = {0.01,0.02,0.001,0.0005};
|
||||
float* arr_src = new float[img_size.width*img_size.height];
|
||||
float* arr_dst = new float[img_size.width*img_size.height];
|
||||
double arr_new_camera_mat[9] = {155.f, 0.f, img_size.width/2.f+img_size.width/50.f, 0, 310.f, img_size.height/2.f+img_size.height/50.f, 0.f, 0.f, 1.f};
|
||||
img_size.width = 800;
|
||||
img_size.height = 600;
|
||||
double cam[9] = {150.f, 0.f, img_size.width/2.f, 0, 300.f, img_size.height/2.f, 0.f, 0.f, 1.f};
|
||||
double dist[4] = {0.01,0.02,0.001,0.0005};
|
||||
float* arr_src = new float[img_size.width*img_size.height];
|
||||
float* arr_dst = new float[img_size.width*img_size.height];
|
||||
double arr_new_camera_mat[9] = {155.f, 0.f, img_size.width/2.f+img_size.width/50.f, 0, 310.f, img_size.height/2.f+img_size.height/50.f, 0.f, 0.f, 1.f};
|
||||
|
||||
CvMat _camera_mat_orig = cvMat(3,3,CV_64F,cam);
|
||||
CvMat _distortion_coeffs_orig = cvMat(1,4,CV_64F,dist);
|
||||
CvMat _new_camera_mat_orig = cvMat(3,3,CV_64F,arr_new_camera_mat);
|
||||
CvMat _src_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_src);
|
||||
CvMat _dst_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_dst);
|
||||
CvMat _camera_mat_orig = cvMat(3,3,CV_64F,cam);
|
||||
CvMat _distortion_coeffs_orig = cvMat(1,4,CV_64F,dist);
|
||||
CvMat _new_camera_mat_orig = cvMat(3,3,CV_64F,arr_new_camera_mat);
|
||||
CvMat _src_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_src);
|
||||
CvMat _dst_orig = cvMat(img_size.height,img_size.width,CV_32FC1,arr_dst);
|
||||
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
_new_camera_mat = &_new_camera_mat_orig;
|
||||
_src = &_src_orig;
|
||||
_dst = &_dst_orig;
|
||||
_camera_mat = &_camera_mat_orig;
|
||||
_distortion_coeffs = &_distortion_coeffs_orig;
|
||||
_new_camera_mat = &_new_camera_mat_orig;
|
||||
_src = &_src_orig;
|
||||
_dst = &_dst_orig;
|
||||
|
||||
//tests
|
||||
useCPlus = true;
|
||||
CvMat* temp;
|
||||
CvMat* temp1;
|
||||
useCPlus = true;
|
||||
CvMat* temp;
|
||||
CvMat* temp1;
|
||||
|
||||
//C tests
|
||||
useCPlus = false;
|
||||
//C tests
|
||||
useCPlus = false;
|
||||
|
||||
temp = cvCreateMat(800,600,CV_32F);
|
||||
temp1 = cvCreateMat(800,601,CV_32F);
|
||||
_src = temp;
|
||||
_dst = temp1;
|
||||
errcount += run_test_case( CV_StsAssert, "Input and output data matrix sizes mismatch" );
|
||||
_src = &_src_orig;
|
||||
_dst = &_dst_orig;
|
||||
cvReleaseMat(&temp);
|
||||
cvReleaseMat(&temp1);
|
||||
temp = cvCreateMat(800,600,CV_32F);
|
||||
temp1 = cvCreateMat(800,601,CV_32F);
|
||||
_src = temp;
|
||||
_dst = temp1;
|
||||
errcount += run_test_case( CV_StsAssert, "Input and output data matrix sizes mismatch" );
|
||||
_src = &_src_orig;
|
||||
_dst = &_dst_orig;
|
||||
cvReleaseMat(&temp);
|
||||
cvReleaseMat(&temp1);
|
||||
|
||||
temp = cvCreateMat(800,600,CV_32F);
|
||||
temp1 = cvCreateMat(800,600,CV_64F);
|
||||
_src = temp;
|
||||
_dst = temp1;
|
||||
errcount += run_test_case( CV_StsAssert, "Input and output data matrix types mismatch" );
|
||||
_src = &_src_orig;
|
||||
_dst = &_dst_orig;
|
||||
cvReleaseMat(&temp);
|
||||
cvReleaseMat(&temp1);
|
||||
temp = cvCreateMat(800,600,CV_32F);
|
||||
temp1 = cvCreateMat(800,600,CV_64F);
|
||||
_src = temp;
|
||||
_dst = temp1;
|
||||
errcount += run_test_case( CV_StsAssert, "Input and output data matrix types mismatch" );
|
||||
_src = &_src_orig;
|
||||
_dst = &_dst_orig;
|
||||
cvReleaseMat(&temp);
|
||||
cvReleaseMat(&temp1);
|
||||
|
||||
//C++ tests
|
||||
useCPlus = true;
|
||||
//C++ tests
|
||||
useCPlus = true;
|
||||
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
new_camera_mat = cv::Mat(&_new_camera_mat_orig);
|
||||
src = cv::Mat(&_src_orig);
|
||||
dst = cv::Mat(&_dst_orig);
|
||||
camera_mat = cv::Mat(&_camera_mat_orig);
|
||||
distortion_coeffs = cv::Mat(&_distortion_coeffs_orig);
|
||||
new_camera_mat = cv::Mat(&_new_camera_mat_orig);
|
||||
src = cv::Mat(&_src_orig);
|
||||
dst = cv::Mat(&_dst_orig);
|
||||
|
||||
//------------
|
||||
delete[] arr_src;
|
||||
delete[] arr_dst;
|
||||
ts->set_failed_test_info(errcount > 0 ? cvtest::TS::FAIL_BAD_ARG_CHECK : cvtest::TS::OK);
|
||||
delete[] arr_src;
|
||||
delete[] arr_dst;
|
||||
ts->set_failed_test_info(errcount > 0 ? cvtest::TS::FAIL_BAD_ARG_CHECK : cvtest::TS::OK);
|
||||
}
|
||||
|
||||
TEST(Calib3d_UndistortPoints, badarg) { CV_UndistortPointsBadArgTest test; test.safe_run(); }
|
||||
|
||||
Reference in New Issue
Block a user