minor fix

diff --git a/modules/gpu/src/cuda/bf_knnmatch.cu b/modules/gpu/src/cuda/bf_knnmatch.cu
index c808509..443dfa6 100644 (file)
--- a/modules/gpu/src/cuda/bf_knnmatch.cu
+++ b/modules/gpu/src/cuda/bf_knnmatch.cu
@@ -742,7 +742,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         {\r
             matchUnrolledCached<16, 128, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
         }\r
-        else if (query.cols <= 256)\r
+        /*else if (query.cols <= 256)\r
         {\r
             matchUnrolled<16, 256, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
         }\r
@@ -753,7 +753,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         else if (query.cols <= 1024)\r
         {            \r
             matchUnrolled<16, 1024, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
-        }\r
+        }*/\r
         else\r
         {\r
             match<16, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
@@ -773,7 +773,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         {\r
             matchUnrolledCached<16, 128, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
         }\r
-        else if (query.cols <= 256)\r
+        /*else if (query.cols <= 256)\r
         {\r
             matchUnrolled<16, 256, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
         }\r
@@ -784,7 +784,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         else if (query.cols <= 1024)\r
         {            \r
             matchUnrolled<16, 1024, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
-        }\r
+        }*/\r
         else\r
         {\r
             match<16, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);\r
@@ -937,7 +937,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         {\r
             calcDistanceUnrolled<16, 128, Dist>(query, train, mask, allDist, stream);\r
         }\r
-        else if (query.cols <= 256)\r
+        /*else if (query.cols <= 256)\r
         {\r
             calcDistanceUnrolled<16, 256, Dist>(query, train, mask, allDist, stream);\r
         }\r
@@ -948,7 +948,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         else if (query.cols <= 1024)\r
         {            \r
             calcDistanceUnrolled<16, 1024, Dist>(query, train, mask, allDist, stream);\r
-        }\r
+        }*/\r
         else\r
         {\r
             calcDistance<16, Dist>(query, train, mask, allDist, stream);\r

diff --git a/modules/gpu/src/cuda/bf_match.cu b/modules/gpu/src/cuda/bf_match.cu
index a2e1923..e3372b3 100644 (file)
--- a/modules/gpu/src/cuda/bf_match.cu
+++ b/modules/gpu/src/cuda/bf_match.cu
@@ -536,7 +536,7 @@ namespace cv { namespace gpu { namespace bf_match
         const dim3 block(BLOCK_SIZE, BLOCK_SIZE);\r
         const dim3 grid(divUp(query.rows, BLOCK_SIZE));\r
 \r
-        const size_t smemSize = (2 * BLOCK_SIZE * BLOCK_SIZE) * sizeof(int);\r
+        const size_t smemSize = (3 * BLOCK_SIZE * BLOCK_SIZE) * sizeof(int);\r
 \r
         match<BLOCK_SIZE, Dist><<<grid, block, smemSize, stream>>>(query, trains, n, mask, trainIdx.data, imgIdx.data, distance.data);\r
         cudaSafeCall( cudaGetLastError() );\r
@@ -561,7 +561,7 @@ namespace cv { namespace gpu { namespace bf_match
         {\r
             matchUnrolledCached<16, 128, Dist>(query, train, mask, trainIdx, distance, stream);\r
         }\r
-        else if (query.cols <= 256)\r
+        /*else if (query.cols <= 256)\r
         {\r
             matchUnrolled<16, 256, Dist>(query, train, mask, trainIdx, distance, stream);\r
         }\r
@@ -572,7 +572,7 @@ namespace cv { namespace gpu { namespace bf_match
         else if (query.cols <= 1024)\r
         {            \r
             matchUnrolled<16, 1024, Dist>(query, train, mask, trainIdx, distance, stream);\r
-        }\r
+        }*/\r
         else\r
         {\r
             match<16, Dist>(query, train, mask, trainIdx, distance, stream);\r
@@ -592,7 +592,7 @@ namespace cv { namespace gpu { namespace bf_match
         {\r
             matchUnrolledCached<16, 128, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);\r
         }\r
-        else if (query.cols <= 256)\r
+        /*else if (query.cols <= 256)\r
         {\r
             matchUnrolled<16, 256, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);\r
         }\r
@@ -603,7 +603,7 @@ namespace cv { namespace gpu { namespace bf_match
         else if (query.cols <= 1024)\r
         {            \r
             matchUnrolled<16, 1024, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);\r
-        }\r
+        }*/\r
         else\r
         {\r
             match<16, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);\r

diff --git a/modules/gpu/src/cuda/bf_radius_match.cu b/modules/gpu/src/cuda/bf_radius_match.cu
index 58b2c8a..6dbaf85 100644 (file)
--- a/modules/gpu/src/cuda/bf_radius_match.cu
+++ b/modules/gpu/src/cuda/bf_radius_match.cu
@@ -283,7 +283,7 @@ namespace cv { namespace gpu { namespace bf_radius_match
         {\r
             matchUnrolled<16, 128, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);\r
         }\r
-        else if (query.cols <= 256)\r
+        /*else if (query.cols <= 256)\r
         {\r
             matchUnrolled<16, 256, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);\r
         }\r
@@ -294,7 +294,7 @@ namespace cv { namespace gpu { namespace bf_radius_match
         else if (query.cols <= 1024)\r
         {            \r
             matchUnrolled<16, 1024, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);\r
-        }\r
+        }*/\r
         else\r
         {\r
             match<16, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);\r
@@ -314,7 +314,7 @@ namespace cv { namespace gpu { namespace bf_radius_match
         {\r
             matchUnrolled<16, 128, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);\r
         }\r
-        else if (query.cols <= 256)\r
+        /*else if (query.cols <= 256)\r
         {\r
             matchUnrolled<16, 256, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);\r
         }\r
@@ -325,7 +325,7 @@ namespace cv { namespace gpu { namespace bf_radius_match
         else if (query.cols <= 1024)\r
         {            \r
             matchUnrolled<16, 1024, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);\r
-        }\r
+        }*/\r
         else\r
         {\r
             match<16, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);\r