Deleted all trailing whitespace.
This commit is contained in:
@@ -165,16 +165,16 @@ namespace ocl_tvl1flow
|
||||
{
|
||||
void centeredGradient(const oclMat &src, oclMat &dx, oclMat &dy);
|
||||
|
||||
void warpBackward(const oclMat &I0, const oclMat &I1, oclMat &I1x, oclMat &I1y,
|
||||
oclMat &u1, oclMat &u2, oclMat &I1w, oclMat &I1wx, oclMat &I1wy,
|
||||
void warpBackward(const oclMat &I0, const oclMat &I1, oclMat &I1x, oclMat &I1y,
|
||||
oclMat &u1, oclMat &u2, oclMat &I1w, oclMat &I1wx, oclMat &I1wy,
|
||||
oclMat &grad, oclMat &rho);
|
||||
|
||||
void estimateU(oclMat &I1wx, oclMat &I1wy, oclMat &grad,
|
||||
oclMat &rho_c, oclMat &p11, oclMat &p12,
|
||||
oclMat &p21, oclMat &p22, oclMat &u1,
|
||||
void estimateU(oclMat &I1wx, oclMat &I1wy, oclMat &grad,
|
||||
oclMat &rho_c, oclMat &p11, oclMat &p12,
|
||||
oclMat &p21, oclMat &p22, oclMat &u1,
|
||||
oclMat &u2, oclMat &error, float l_t, float theta);
|
||||
|
||||
void estimateDualVariables(oclMat &u1, oclMat &u2,
|
||||
void estimateDualVariables(oclMat &u1, oclMat &u2,
|
||||
oclMat &p11, oclMat &p12, oclMat &p21, oclMat &p22, float taut);
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ void cv::ocl::OpticalFlowDual_TVL1_OCL::procOneScale(const oclMat &I0, const ocl
|
||||
double error = numeric_limits<double>::max();
|
||||
for (int n = 0; error > scaledEpsilon && n < iterations; ++n)
|
||||
{
|
||||
estimateU(I1wx, I1wy, grad, rho_c, p11, p12, p21, p22,
|
||||
estimateU(I1wx, I1wy, grad, rho_c, p11, p12, p21, p22,
|
||||
u1, u2, diff, l_t, static_cast<float>(theta));
|
||||
|
||||
error = ocl::sum(diff)[0];
|
||||
@@ -299,9 +299,9 @@ void ocl_tvl1flow::estimateDualVariables(oclMat &u1, oclMat &u2, oclMat &p11, oc
|
||||
Context *clCxt = u1.clCxt;
|
||||
|
||||
size_t localThread[] = {32, 8, 1};
|
||||
size_t globalThread[] =
|
||||
size_t globalThread[] =
|
||||
{
|
||||
u1.cols,
|
||||
u1.cols,
|
||||
u1.rows,
|
||||
1
|
||||
};
|
||||
@@ -345,17 +345,17 @@ void ocl_tvl1flow::estimateDualVariables(oclMat &u1, oclMat &u2, oclMat &p11, oc
|
||||
openCLExecuteKernel(clCxt, &tvl1flow, kernelName, globalThread, localThread, args, -1, -1);
|
||||
}
|
||||
|
||||
void ocl_tvl1flow::estimateU(oclMat &I1wx, oclMat &I1wy, oclMat &grad,
|
||||
oclMat &rho_c, oclMat &p11, oclMat &p12,
|
||||
oclMat &p21, oclMat &p22, oclMat &u1,
|
||||
void ocl_tvl1flow::estimateU(oclMat &I1wx, oclMat &I1wy, oclMat &grad,
|
||||
oclMat &rho_c, oclMat &p11, oclMat &p12,
|
||||
oclMat &p21, oclMat &p22, oclMat &u1,
|
||||
oclMat &u2, oclMat &error, float l_t, float theta)
|
||||
{
|
||||
Context* clCxt = I1wx.clCxt;
|
||||
|
||||
size_t localThread[] = {32, 8, 1};
|
||||
size_t globalThread[] =
|
||||
size_t globalThread[] =
|
||||
{
|
||||
I1wx.cols,
|
||||
I1wx.cols,
|
||||
I1wx.rows,
|
||||
1
|
||||
};
|
||||
@@ -409,7 +409,7 @@ void ocl_tvl1flow::warpBackward(const oclMat &I0, const oclMat &I1, oclMat &I1x,
|
||||
{
|
||||
Context* clCxt = I0.clCxt;
|
||||
const bool isImgSupported = support_image2d(clCxt);
|
||||
|
||||
|
||||
CV_Assert(isImgSupported);
|
||||
|
||||
int u1ElementSize = u1.elemSize();
|
||||
@@ -433,9 +433,9 @@ void ocl_tvl1flow::warpBackward(const oclMat &I0, const oclMat &I1, oclMat &I1x,
|
||||
u2_offset_x = u2_offset_x/u2.elemSize();
|
||||
|
||||
size_t localThread[] = {32, 8, 1};
|
||||
size_t globalThread[] =
|
||||
size_t globalThread[] =
|
||||
{
|
||||
I0.cols,
|
||||
I0.cols,
|
||||
I0.rows,
|
||||
1
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user