generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. Input/OutputArray optimizations;

Browse Source 
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
This commit is contained in:
Vadim Pisarevsky
2015-04-07 16:44:26 +03:00
parent 44f112a9de
commit 052593c760
34 changed files with 888 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
View File

@@ -106,6 +106,8 @@ protected:
class CV_EXPORTS VoronoiSeamFinder : public PairwiseSeamFinder
{
public:
virtual void find(const std::vector<UMat> &src, const std::vector<Point> &corners,
std::vector<UMat> &masks);
virtual void find(const std::vector<Size> &size, const std::vector<Point> &corners,
std::vector<UMat> &masks);
private:

4
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
View File

@@ -186,14 +186,18 @@ public:
*/
PlaneWarper(float scale = 1.f) { projector_.scale = scale; }
Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R);
Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R, InputArray T);
virtual Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, OutputArray xmap, OutputArray ymap);
Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap);
Point warp(InputArray src, InputArray K, InputArray R,
int interp_mode, int border_mode, OutputArray dst);
virtual Point warp(InputArray src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode,
OutputArray dst);
Rect warpRoi(Size src_size, InputArray K, InputArray R);
Rect warpRoi(Size src_size, InputArray K, InputArray R, InputArray T);
protected:

5
modules/stitching/src/seam_finders.cpp
View File

@@ -82,6 +82,11 @@ void PairwiseSeamFinder::run()
}
}
void VoronoiSeamFinder::find(const std::vector<UMat> &src, const std::vector<Point> &corners,
std::vector<UMat> &masks)
{
PairwiseSeamFinder::find(src, corners, masks);
}
void VoronoiSeamFinder::find(const std::vector<Size> &sizes, const std::vector<Point> &corners,
std::vector<UMat> &masks)

21
modules/stitching/src/warpers.cpp
View File

@@ -87,6 +87,13 @@ Point2f PlaneWarper::warpPoint(const Point2f &pt, InputArray K, InputArray R, In
return uv;
}
Point2f PlaneWarper::warpPoint(const Point2f &pt, InputArray K, InputArray R)
{
float tz[] = {0.f, 0.f, 0.f};
Mat_<float> T(3, 1, tz);
return warpPoint(pt, K, R, T);
}
Rect PlaneWarper::buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap)
{
return buildMaps(src_size, K, R, Mat::zeros(3, 1, CV_32FC1), xmap, ymap);
@@ -155,6 +162,13 @@ Point PlaneWarper::warp(InputArray src, InputArray K, InputArray R, InputArray T
return dst_roi.tl();
}
Point PlaneWarper::warp(InputArray src, InputArray K, InputArray R,
int interp_mode, int border_mode, OutputArray dst)
{
float tz[] = {0.f, 0.f, 0.f};
Mat_<float> T(3, 1, tz);
return warp(src, K, R, T, interp_mode, border_mode, dst);
}
Rect PlaneWarper::warpRoi(Size src_size, InputArray K, InputArray R, InputArray T)
{
@@ -166,6 +180,13 @@ Rect PlaneWarper::warpRoi(Size src_size, InputArray K, InputArray R, InputArray
return Rect(dst_tl, Point(dst_br.x + 1, dst_br.y + 1));
}
Rect PlaneWarper::warpRoi(Size src_size, InputArray K, InputArray R)
{
float tz[] = {0.f, 0.f, 0.f};
Mat_<float> T(3, 1, tz);
return warpRoi(src_size, K, R, T);
}
void PlaneWarper::detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br)
{