Merge pull request #8525 from nnorwitz:master

pull/8561/head
Alexander Alekhin 8 years ago
commit c839a2ccb1
  1. 2
      modules/core/include/opencv2/core/cuda/warp.hpp
  2. 2
      modules/cudev/include/opencv2/cudev/warp/warp.hpp

@ -64,7 +64,7 @@ namespace cv { namespace cuda { namespace device
static __device__ __forceinline__ unsigned int laneId() static __device__ __forceinline__ unsigned int laneId()
{ {
unsigned int ret; unsigned int ret;
asm("mov.u32 %0, %laneid;" : "=r"(ret) ); asm("mov.u32 %0, %%laneid;" : "=r"(ret) );
return ret; return ret;
} }

@ -64,7 +64,7 @@ struct Warp
__device__ __forceinline__ static uint laneId() __device__ __forceinline__ static uint laneId()
{ {
uint ret; uint ret;
asm("mov.u32 %0, %laneid;" : "=r"(ret)); asm("mov.u32 %0, %%laneid;" : "=r"(ret));
return ret; return ret;
} }

Loading…
Cancel
Save