Skip to content

O
opencv
Commit 02646427 authored by LeonidBeynenson's avatar LeonidBeynenson
Browse files
Options

Fixed arguments of the function calcOpticalFlowSF.

parent 66b90d19
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
modules/video/include/opencv2/video/tracking.hpp
View file @ 02646427
......@@ -328,16 +328,16 @@ CV_EXPORTS_W Mat estimateRigidTransform( InputArray src, InputArray dst,
bool fullAffine);
//! computes dense optical flow using Simple Flow algorithm
CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
Mat& to,
Mat& flow,
CV_EXPORTS_W void calcOpticalFlowSF(InputArray from,
InputArray to,
OutputArray flow,
int layers,
int averaging_block_size,
int max_flow);
CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
Mat& to,
Mat& flow,
CV_EXPORTS_W void calcOpticalFlowSF(InputArray from,
InputArray to,
OutputArray flow,
int layers,
int averaging_block_size,
int max_flow,
......
modules/video/src/simpleflow.cpp
View file @ 02646427
......@@ -447,7 +447,7 @@ static void extrapolateFlow(Mat& flow,
}
}
static void buildPyramidWithResizeMethod(Mat& src,
static void buildPyramidWithResizeMethod(const Mat& src,
vector<Mat>& pyramid,
int layers,
int interpolation_type) {
......@@ -464,9 +464,9 @@ static void buildPyramidWithResizeMethod(Mat& src,
}
}
CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
Mat& to,
Mat& resulted_flow,
CV_EXPORTS_W void calcOpticalFlowSF(InputArray _from,
InputArray _to,
OutputArray _resulted_flow,
int layers,
int averaging_radius,
int max_flow,
......@@ -479,7 +479,11 @@ CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
int upscale_averaging_radius,
double upscale_sigma_dist,
double upscale_sigma_color,
double speed_up_thr) {
double speed_up_thr)
{
Mat from = _from.getMat();
Mat to = _to.getMat();
vector<Mat> pyr_from_images;
vector<Mat> pyr_to_images;
......@@ -632,14 +636,15 @@ CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
GaussianBlur(flow, flow, Size(3, 3), 5);
resulted_flow = Mat(flow.size(), CV_32FC2);
_resulted_flow.create(flow.size(), CV_32FC2);
Mat resulted_flow = _resulted_flow.getMat();
int from_to[] = {0,1 , 1,0};
mixChannels(&flow, 1, &resulted_flow, 1, from_to, 2);
}
CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
Mat& to,
Mat& flow,
CV_EXPORTS_W void calcOpticalFlowSF(InputArray from,
InputArray to,
OutputArray flow,
int layers,
int averaging_block_size,
int max_flow) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment