potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2023-10-16 21:25:56 +03:00
parent d789cb459c 2f63c58380
commit 97620c053f
221 changed files with 3584 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
+6 -6
View File
@@ -86,10 +86,10 @@ public:
@param mask Image mask
*/
CV_WRAP virtual void apply(int index, Point corner, InputOutputArray image, InputArray mask) = 0;
CV_WRAP virtual void getMatGains(CV_OUT std::vector<Mat>& ) {CV_Error(Error::StsInternal, "");};
CV_WRAP virtual void setMatGains(std::vector<Mat>& ) { CV_Error(Error::StsInternal, ""); };
CV_WRAP void setUpdateGain(bool b) { updateGain = b; };
CV_WRAP bool getUpdateGain() { return updateGain; };
CV_WRAP virtual void getMatGains(CV_OUT std::vector<Mat>& ) {CV_Error(Error::StsInternal, "");}
CV_WRAP virtual void setMatGains(std::vector<Mat>& ) { CV_Error(Error::StsInternal, ""); }
CV_WRAP void setUpdateGain(bool b) { updateGain = b; }
CV_WRAP bool getUpdateGain() { return updateGain; }
protected :
bool updateGain;
};
@@ -102,8 +102,8 @@ public:
void feed(const std::vector<Point> &/*corners*/, const std::vector<UMat> &/*images*/,
const std::vector<std::pair<UMat,uchar> > &/*masks*/) CV_OVERRIDE { }
CV_WRAP void apply(int /*index*/, Point /*corner*/, InputOutputArray /*image*/, InputArray /*mask*/) CV_OVERRIDE { }
CV_WRAP void getMatGains(CV_OUT std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; };
CV_WRAP void setMatGains(std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; };
CV_WRAP void getMatGains(CV_OUT std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; }
CV_WRAP void setMatGains(std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; }
};
/** @brief Exposure compensator which tries to remove exposure related artifacts by adjusting image
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
+4 -4
View File
@@ -61,7 +61,7 @@ struct CV_EXPORTS_W_SIMPLE ImageFeatures
CV_PROP_RW Size img_size;
CV_PROP_RW std::vector<KeyPoint> keypoints;
CV_PROP_RW UMat descriptors;
CV_WRAP std::vector<KeyPoint> getKeypoints() { return keypoints; };
CV_WRAP std::vector<KeyPoint> getKeypoints() { return keypoints; }
};
/** @brief
@@ -109,8 +109,8 @@ struct CV_EXPORTS_W_SIMPLE MatchesInfo
CV_PROP_RW int num_inliers; //!< Number of geometrically consistent matches
CV_PROP_RW Mat H; //!< Estimated transformation
CV_PROP_RW double confidence; //!< Confidence two images are from the same panorama
CV_WRAP std::vector<DMatch> getMatches() { return matches; };
CV_WRAP std::vector<uchar> getInliers() { return inliers_mask; };
CV_WRAP std::vector<DMatch> getMatches() { return matches; }
CV_WRAP std::vector<uchar> getInliers() { return inliers_mask; }
};
/** @brief Feature matchers base class. */
@@ -138,7 +138,7 @@ public:
@sa detail::MatchesInfo
*/
CV_WRAP_AS(apply2) void operator ()(const std::vector<ImageFeatures> &features, CV_OUT std::vector<MatchesInfo> &pairwise_matches,
const cv::UMat &mask = cv::UMat()) { match(features, pairwise_matches, mask); };
const cv::UMat &mask = cv::UMat()) { match(features, pairwise_matches, mask); }
/** @return True, if it's possible to use the same matcher instance in parallel, false otherwise
*/
modules/stitching/include/opencv2/stitching/warpers.hpp
+1 -1
View File
@@ -53,7 +53,7 @@ namespace cv {
public:
CV_WRAP PyRotationWarper(String type, float scale);
CV_WRAP PyRotationWarper() {};
CV_WRAP PyRotationWarper() {}
~PyRotationWarper() {}
/** @brief Projects the image point.