Merge pull request #8525 from nnorwitz:master

c839a2cc · Alexander Alekhin · 6c07b446 · 24e8cd1a · c839a2cc · c839a2cc
Commit c839a2cc authored Apr 11, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

warp.hpp modules/core/include/opencv2/core/cuda/warp.hpp +1 -1

warp.hpp modules/cudev/include/opencv2/cudev/warp/warp.hpp +1 -1

No files found.
--- a/modules/core/include/opencv2/core/cuda/warp.hpp
+++ b/modules/core/include/opencv2/core/cuda/warp.hpp
@@ -64,7 +64,7 @@ namespace cv { namespace cuda { namespace device
        static __device__ __forceinline__ unsigned int laneId()
        {
            unsigned int ret;
-            asm("mov.u32 %0, %laneid;" : "=r"(ret) );
+            asm("mov.u32 %0, %%laneid;" : "=r"(ret) );
            return ret;
        }


--- a/modules/cudev/include/opencv2/cudev/warp/warp.hpp
+++ b/modules/cudev/include/opencv2/cudev/warp/warp.hpp
@@ -64,7 +64,7 @@ struct Warp
    __device__ __forceinline__ static uint laneId()
    {
        uint ret;
-        asm("mov.u32 %0, %laneid;" : "=r"(ret));
+        asm("mov.u32 %0, %%laneid;" : "=r"(ret));
        return ret;
    }