Merge moved code from opencv

alalek · alalek · commit 0915b7eaddba · 2019-07-21T17:59:59.000Z
diff --git a/modules/cudalegacy/src/calib3d.cpp b/modules/cudalegacy/src/calib3d.cpp
@@ -181,7 +181,7 @@ namespace
                    image_subset(0, i) = image->at<Point2f>(subset_indices[i]);
                 }
 
-                solvePnP(object_subset, image_subset, *camera_mat, *dist_coef, rot_vec, transl_vec);
+                solvePnP(object_subset, image_subset, *camera_mat, *dist_coef, rot_vec, transl_vec, false, SOLVEPNP_EPNP);
 
                 // Remember translation vector
                 Mat transl_vec_ = transl_vectors.colRange(iter * 3, (iter + 1) * 3);

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ namespace`
`181`	`181`	`image_subset(0, i) = image->at<Point2f>(subset_indices[i]);`
`182`	`182`	`}`
`183`	`183`
`184`		`- solvePnP(object_subset, image_subset, camera_mat, dist_coef, rot_vec, transl_vec);`
	`184`	`+ solvePnP(object_subset, image_subset, camera_mat, dist_coef, rot_vec, transl_vec, false, SOLVEPNP_EPNP);`
`185`	`185`
`186`	`186`	`// Remember translation vector`
`187`	`187`	`Mat transl_vec_ = transl_vectors.colRange(iter * 3, (iter + 1) * 3);`