mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
Merge branch 4.x
This commit is contained in:
@@ -294,7 +294,7 @@ public:
|
||||
*/
|
||||
CV_WRAP Status stitch(InputArrayOfArrays images, InputArrayOfArrays masks, OutputArray pano);
|
||||
|
||||
/** @brief Returns indeces of input images used in panorama stitching
|
||||
/** @brief Returns indices of input images used in panorama stitching
|
||||
*/
|
||||
CV_WRAP std::vector<int> component() const { return indices_; }
|
||||
|
||||
|
||||
@@ -156,7 +156,7 @@ bool calibrateRotatingCamera(const std::vector<Mat> &Hs, Mat &K)
|
||||
for (int i = 0; i < m; ++i)
|
||||
{
|
||||
CV_Assert(Hs[i].size() == Size(3, 3) && Hs[i].type() == CV_64F);
|
||||
Hs_[i] = Hs[i] / std::pow(determinant(Hs[i]), 1./3.);
|
||||
Hs_[i] = Hs[i] / std::cbrt(determinant(Hs[i]));
|
||||
}
|
||||
|
||||
const int idx_map[3][3] = {{0, 1, 2}, {1, 3, 4}, {2, 4, 5}};
|
||||
|
||||
Reference in New Issue
Block a user