Merge pull request #28041 from asmorkalov:as/merge_fix

4.x->5.x merge fix.

modules/3d/include/opencv2/3d.hpp

@@ -1023,7 +1023,8 @@ More information about Perspective-n-Points is described in @ref calib3d_solvePn
        of the P3P problem, the last one is used to retain the best solution that minimizes the reprojection error).
    -   With @ref SOLVEPNP_ITERATIVE method and `useExtrinsicGuess=true`, the minimum number of points is 3 (3 points
        are sufficient to compute a pose but there are up to 4 solutions). The initial solution should be close to the
-       global solution to converge.
+       global solution to converge. The function returns true if some solution is found. User code is responsible for
+       solution quality assessment.
    -   With @ref SOLVEPNP_IPPE input points must be >= 4 and object points must be coplanar.
    -   With @ref SOLVEPNP_IPPE_SQUARE this is a special case suitable for marker pose estimation.
        Number of input points must be 4. Object points must be defined in the following order:
@@ -2684,7 +2685,7 @@ CV_EXPORTS_W void undistortImage(InputArray distorted, OutputArray undistorted,
     InputArray K, InputArray D, InputArray Knew = cv::noArray(), const Size& new_size = Size());
 
 /**
-@brief Finds an object pose from 3D-2D point correspondences for fisheye camera moodel.
+@brief Finds an object pose from 3D-2D point correspondences for fisheye camera model.
 
 @param objectPoints Array of object points in the object coordinate space, Nx3 1-channel or
 1xN/Nx1 3-channel, where N is the number of points. vector\<Point3d\> can also be passed here.
@@ -2711,7 +2712,7 @@ Number of input points must be 4. Object points must be defined in the following
 - point 3: [-squareLength / 2, -squareLength / 2, 0]
 - for all the other flags, number of input points must be >= 4 and object points can be in any configuration.
 @param criteria Termination criteria for internal undistortPoints call.
-The function interally undistorts points with @ref undistortPoints and call @ref cv::solvePnP,
+The function internally undistorts points with @ref undistortPoints and call @ref cv::solvePnP,
 thus the input are very similar. Check there and Perspective-n-Points is described in @ref calib3d_solvePnP
 for more information.
 */

modules/calib3d/doc/calib3d.bib

@@ -1,64 +0,0 @@
-@inproceedings{ding2023revisiting,
-  title={Revisiting the P3P Problem},
-  author={Ding, Yaqing and Yang, Jian and Larsson, Viktor and Olsson, Carl and {\AA}str{\"o}m, Kalle},
-  booktitle={Proceedings of the IEEE/CVF Conference on Computer Vision and Pattern Recognition},
-  pages={4872--4880},
-  year={2023},
-  url={https://openaccess.thecvf.com/content/CVPR2023/papers/Ding_Revisiting_the_P3P_Problem_CVPR_2023_paper.pdf}
-}
-@article{lepetit2009epnp,
-  title={Epnp: An accurate o (n) solution to the pnp problem},
-  author={Lepetit, Vincent and Moreno-Noguer, Francesc and Fua, Pascal},
-  journal={International journal of computer vision},
-  volume={81},
-  number={2},
-  pages={155--166},
-  year={2009},
-  publisher={Springer},
-  url={https://www.tugraz.at/fileadmin/user_upload/Institute/ICG/Images/team_lepetit/publications/lepetit_ijcv08.pdf}
-}
-
-@inproceedings{hesch2011direct,
-  title={A direct least-squares (DLS) method for PnP},
-  author={Hesch, Joel and Roumeliotis, Stergios and others},
-  booktitle={Computer Vision (ICCV), 2011 IEEE International Conference on},
-  pages={383--390},
-  year={2011},
-  organization={IEEE},
-  url={https://www-users.cse.umn.edu/~stergios/papers/ICCV-11-DLS-PnP.pdf}
-}
-
-@article{penate2013exhaustive,
-  title={Exhaustive linearization for robust camera pose and focal length estimation},
-  author={Penate-Sanchez, Adrian and Andrade-Cetto, Juan and Moreno-Noguer, Francesc},
-  journal={Pattern Analysis and Machine Intelligence, IEEE Transactions on},
-  volume={35},
-  number={10},
-  pages={2387--2400},
-  year={2013},
-  publisher={IEEE},
-  url={https://www.researchgate.net/publication/235402233_Exhaustive_Linearization_for_Robust_Camera_Pose_and_Focal_Length_Estimation}
-}
-
-@inproceedings{strobl2011iccv,
-  title={More accurate pinhole camera calibration with imperfect planar target},
-  author={Strobl, Klaus H. and Hirzinger, Gerd},
-  booktitle={2011 IEEE International Conference on Computer Vision (ICCV)},
-  pages={1068-1075},
-  month={Nov},
-  year={2011},
-  address={Barcelona, Spain},
-  publisher={IEEE},
-  url={https://elib.dlr.de/71888/1/strobl_2011iccv.pdf},
-  doi={10.1109/ICCVW.2011.6130369}
-}
-
-@inproceedings{Terzakis2020SQPnP,
-  title={A Consistently Fast and Globally Optimal Solution to the Perspective-n-Point Problem},
-  author={George Terzakis and Manolis Lourakis},
-  booktitle={European Conference on Computer Vision},
-  pages={478--494},
-  year={2020},
-  publisher={Springer International Publishing},
-  url={https://www.ecva.net/papers/eccv_2020/papers_ECCV/papers/123460460.pdf}
-}