Skip to content

O
opencv
Commit de35c59b authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #7517 from paroj:pp_dpdf

parents ecac70f1 01b592c8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
modules/calib3d/src/calibration.cpp
View file @ de35c59b
...@@ -787,7 +787,7 @@ CV_IMPL void cvProjectPoints2( const CvMat* objectPoints, ...@@ -787,7 +787,7 @@ CV_IMPL void cvProjectPoints2( const CvMat* objectPoints,
{ {
if( dpdc_p ) if( dpdc_p )
{ {
dpdc_p[0] = 1; dpdc_p[1] = 0; dpdc_p[0] = 1; dpdc_p[1] = 0; // dp_xdc_x; dp_xdc_y
dpdc_p[dpdc_step] = 0; dpdc_p[dpdc_step] = 0;
dpdc_p[dpdc_step+1] = 1; dpdc_p[dpdc_step+1] = 1;
dpdc_p += dpdc_step*2; dpdc_p += dpdc_step*2;
...@@ -797,7 +797,7 @@ CV_IMPL void cvProjectPoints2( const CvMat* objectPoints, ...@@ -797,7 +797,7 @@ CV_IMPL void cvProjectPoints2( const CvMat* objectPoints,
{ {
if( fixedAspectRatio ) if( fixedAspectRatio )
{ {
dpdf_p[0] = 0; dpdf_p[1] = xd*aspectRatio; dpdf_p[0] = 0; dpdf_p[1] = xd*aspectRatio; // dp_xdf_x; dp_xdf_y
dpdf_p[dpdf_step] = 0; dpdf_p[dpdf_step] = 0;
dpdf_p[dpdf_step+1] = yd; dpdf_p[dpdf_step+1] = yd;
} }
...@@ -1496,6 +1496,8 @@ static double cvCalibrateCamera2Internal( const CvMat* objectPoints, ...@@ -1496,6 +1496,8 @@ static double cvCalibrateCamera2Internal( const CvMat* objectPoints,
param[0] = A(0, 0); param[1] = A(1, 1); param[2] = A(0, 2); param[3] = A(1, 2); param[0] = A(0, 0); param[1] = A(1, 1); param[2] = A(0, 2); param[3] = A(1, 2);
std::copy(k, k + 14, param + 4); std::copy(k, k + 14, param + 4);
if(flags & CALIB_FIX_ASPECT_RATIO)
mask[0] = 0;
if( flags & CV_CALIB_FIX_FOCAL_LENGTH ) if( flags & CV_CALIB_FIX_FOCAL_LENGTH )
mask[0] = mask[1] = 0; mask[0] = mask[1] = 0;
if( flags & CV_CALIB_FIX_PRINCIPAL_POINT ) if( flags & CV_CALIB_FIX_PRINCIPAL_POINT )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment