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

Small fixed #2

Browse Source
This commit is contained in:
Yury Zemlyanskiy 2012-09-05 14:36:40 +04:00
parent 9d1aa37e21
commit 036258b8da
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/video/src/simpleflow.cpp
View File

@ -259,8 +259,8 @@ static void calcOpticalFlowSingleScaleSF(const Mat& prev_extended,
if (cost < min_cost) { if (cost < min_cost) {
min_cost = cost; min_cost = cost;
best_u = u + u0; best_u = (float)(u + u0);
best_v = v + v0; best_v = (float)(v + v0);
} }
} }
} }
@ -309,7 +309,7 @@ static Mat calcIrregularityMat(const Mat& flow, int radius) {
static void selectPointsToRecalcFlow(const Mat& flow, static void selectPointsToRecalcFlow(const Mat& flow,
int irregularity_metric_radius, int irregularity_metric_radius,
int speed_up_thr, float speed_up_thr,
int curr_rows, int curr_rows,
int curr_cols, int curr_cols,
const Mat& prev_speed_up, const Mat& prev_speed_up,
@ -562,7 +562,7 @@ CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
selectPointsToRecalcFlow(flow, selectPointsToRecalcFlow(flow,
averaging_radius, averaging_radius,
(int)speed_up_thr, speed_up_thr,
curr_rows, curr_rows,
curr_cols, curr_cols,
speed_up, speed_up,
@ -586,8 +586,8 @@ CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
prev_from, prev_from,
confidence, confidence,
flow, flow,
upscale_averaging_radius, (float)upscale_averaging_radius,
upscale_sigma_dist, (float)upscale_sigma_dist,
upscale_sigma_color); upscale_sigma_color);
flow_inv = upscaleOpticalFlow(curr_rows, flow_inv = upscaleOpticalFlow(curr_rows,
@ -596,8 +596,8 @@ CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
confidence_inv, confidence_inv,
flow_inv, flow_inv,
upscale_averaging_radius, upscale_averaging_radius,
upscale_sigma_dist, (float)upscale_sigma_dist,
upscale_sigma_color); (float)upscale_sigma_color);
calcConfidence(curr_from, curr_to, flow, confidence, max_flow); calcConfidence(curr_from, curr_to, flow, confidence, max_flow);
calcOpticalFlowSingleScaleSF(curr_from_extended, calcOpticalFlowSingleScaleSF(curr_from_extended,
@ -623,8 +623,8 @@ CV_EXPORTS_W void calcOpticalFlowSF(Mat& from,
extrapolateFlow(flow_inv, speed_up_inv); extrapolateFlow(flow_inv, speed_up_inv);
//TODO: should we remove occlusions for the last stage? //TODO: should we remove occlusions for the last stage?
removeOcclusions(flow, flow_inv, occ_thr, confidence); removeOcclusions(flow, flow_inv, (float)occ_thr, confidence);
removeOcclusions(flow_inv, flow, occ_thr, confidence_inv); removeOcclusions(flow_inv, flow, (float)occ_thr, confidence_inv);
} }
crossBilateralFilter(flow, curr_from, confidence, flow, crossBilateralFilter(flow, curr_from, confidence, flow,