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

Merge pull request #6940 from andy-held:cuda_pyrlk_static_const_init

Browse Source
This commit is contained in:
Maksim Shabunin 2016-07-19 08:47:57 +00:00
commit 644c0dd5f4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/cudaoptflow/src/cuda/pyrlk.cu
View File

@ -347,13 +347,19 @@ namespace pyrlk
template <typename T>
struct DenormalizationFactor
{
static const float factor = 1.0;
static __device__ __forceinline__ float factor()
{
return 1.0f;
}
};
template <>
struct DenormalizationFactor<uchar>
{
static const float factor = 255.0;
static __device__ __forceinline__ float factor()
{
return 255.0f;
}
};
template <int cn, int PATCH_X, int PATCH_Y, bool calcErr, typename T>
@ -544,7 +550,7 @@ namespace pyrlk
nextPts[blockIdx.x] = nextPt;
if (calcErr)
err[blockIdx.x] = static_cast<float>(errval) / (::min(cn, 3) * c_winSize_x * c_winSize_y) * DenormalizationFactor<T>::factor;
err[blockIdx.x] = static_cast<float>(errval) / (::min(cn, 3) * c_winSize_x * c_winSize_y) * DenormalizationFactor<T>::factor();
}
}