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

rewrite core/cuda/vec_math.hpp file

Browse Source 
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
This commit is contained in:
Vladislav Vinogradov
2013-06-07 14:56:37 +04:00
parent 869a35faef
commit 14e4b3adde
8 changed files with 860 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gpuimgproc/src/cuda/hough.cu
View File

@@ -48,6 +48,7 @@
#include "opencv2/core/cuda/common.hpp"
#include "opencv2/core/cuda/emulation.hpp"
#include "opencv2/core/cuda/vec_math.hpp"
#include "opencv2/core/cuda/functional.hpp"
#include "opencv2/core/cuda/limits.hpp"
#include "opencv2/core/cuda/dynamic_smem.hpp"
@@ -811,7 +812,7 @@ namespace cv { namespace gpu { namespace cudev
const int ind = ::atomicAdd(r_sizes + n, 1);
if (ind < maxSize)
r_table(n, ind) = p - templCenter;
r_table(n, ind) = saturate_cast<short2>(p - templCenter);
}
void buildRTable_gpu(const unsigned int* coordList, const float* thetaList, int pointsCount,
@@ -855,7 +856,7 @@ namespace cv { namespace gpu { namespace cudev
for (int j = 0; j < r_row_size; ++j)
{
short2 c = p - r_row[j];
int2 c = p - r_row[j];
c.x = __float2int_rn(c.x * idp);
c.y = __float2int_rn(c.y * idp);