mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed static analyzer warnings in DISOpticalFlow

Browse Source
This commit is contained in:
Vitaly Tuzov 2018-12-04 12:57:14 +03:00
parent 2e0150e601
commit 388ccda85d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/video/src/dis_flow.cpp
View File

@ -226,9 +226,11 @@ DISOpticalFlowImpl::DISOpticalFlowImpl()
border_size = 16; border_size = 16;
use_mean_normalization = true; use_mean_normalization = true;
use_spatial_propagation = true; use_spatial_propagation = true;
coarsest_scale = 10;
/* Use separate variational refinement instances for different scales to avoid repeated memory allocation: */ /* Use separate variational refinement instances for different scales to avoid repeated memory allocation: */
int max_possible_scales = 10; int max_possible_scales = 10;
ws = hs = w = h = 0;
for (int i = 0; i < max_possible_scales; i++) for (int i = 0; i < max_possible_scales; i++)
variational_refinement_processors.push_back(VariationalRefinement::create()); variational_refinement_processors.push_back(VariationalRefinement::create());
} }
@ -1035,6 +1037,7 @@ void DISOpticalFlowImpl::Densification_ParBody::operator()(const Range &range) c
sum_Uy += coef * Sy_ptr[is * dis->ws + js]; sum_Uy += coef * Sy_ptr[is * dis->ws + js];
sum_coef += coef; sum_coef += coef;
} }
CV_DbgAssert(sum_coef != 0);
Ux_ptr[i * dis->w + j] = sum_Ux / sum_coef; Ux_ptr[i * dis->w + j] = sum_Ux / sum_coef;
Uy_ptr[i * dis->w + j] = sum_Uy / sum_coef; Uy_ptr[i * dis->w + j] = sum_Uy / sum_coef;
} }

6
modules/video/src/variational_refinement.cpp
View File

@ -93,6 +93,7 @@ class VariationalRefinementImpl CV_FINAL : public VariationalRefinement
int red_even_len, red_odd_len; int red_even_len, red_odd_len;
int black_even_len, black_odd_len; int black_even_len, black_odd_len;
RedBlackBuffer();
void create(Size s); void create(Size s);
void release(); void release();
}; };
@ -366,6 +367,10 @@ void VariationalRefinementImpl::updateRepeatedBorders(RedBlackBuffer &dst)
} }
} }
VariationalRefinementImpl::RedBlackBuffer::RedBlackBuffer()
{
release();
}
void VariationalRefinementImpl::RedBlackBuffer::create(Size s) void VariationalRefinementImpl::RedBlackBuffer::create(Size s)
{ {
/* Allocate enough memory to include borders */ /* Allocate enough memory to include borders */
@ -386,6 +391,7 @@ void VariationalRefinementImpl::RedBlackBuffer::release()
{ {
red.release(); red.release();
black.release(); black.release();
red_even_len = red_odd_len = black_even_len = black_odd_len = 0;
} }
VariationalRefinementImpl::ParallelOp_ParBody::ParallelOp_ParBody(VariationalRefinementImpl &_var, vector<Op> _ops, VariationalRefinementImpl::ParallelOp_ParBody::ParallelOp_ParBody(VariationalRefinementImpl &_var, vector<Op> _ops,