From: Vladislav Vinogradov <no@email>
Date: Wed, 12 Oct 2011 11:36:10 +0000 (+0000)
Subject: minor fix
X-Git-Tag: accepted/2.0/20130307.220821~1717
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=631d4b483a08b58fbc6588573a7d36b272fbd9db;p=profile%2Fivi%2Fopencv.git

minor fix
---

diff --git a/modules/gpu/src/cuda/bf_knnmatch.cu b/modules/gpu/src/cuda/bf_knnmatch.cu
index c808509..443dfa6 100644
--- 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
         {
             matchUnrolledCached<16, 128, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);
         }
-        else if (query.cols <= 256)
+        /*else if (query.cols <= 256)
         {
             matchUnrolled<16, 256, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);
         }
@@ -753,7 +753,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         else if (query.cols <= 1024)
         {            
             matchUnrolled<16, 1024, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);
-        }
+        }*/
         else
         {
             match<16, Dist>(query, train, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<float2> > (distance), stream);
@@ -773,7 +773,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         {
             matchUnrolledCached<16, 128, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);
         }
-        else if (query.cols <= 256)
+        /*else if (query.cols <= 256)
         {
             matchUnrolled<16, 256, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);
         }
@@ -784,7 +784,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         else if (query.cols <= 1024)
         {            
             matchUnrolled<16, 1024, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);
-        }
+        }*/
         else
         {
             match<16, Dist>(query, trains, n, mask, static_cast< DevMem2D_<int2> >(trainIdx), static_cast< DevMem2D_<int2> >(imgIdx), static_cast< DevMem2D_<float2> > (distance), stream);
@@ -937,7 +937,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         {
             calcDistanceUnrolled<16, 128, Dist>(query, train, mask, allDist, stream);
         }
-        else if (query.cols <= 256)
+        /*else if (query.cols <= 256)
         {
             calcDistanceUnrolled<16, 256, Dist>(query, train, mask, allDist, stream);
         }
@@ -948,7 +948,7 @@ namespace cv { namespace gpu { namespace bf_knnmatch
         else if (query.cols <= 1024)
         {            
             calcDistanceUnrolled<16, 1024, Dist>(query, train, mask, allDist, stream);
-        }
+        }*/
         else
         {
             calcDistance<16, Dist>(query, train, mask, allDist, stream);
diff --git a/modules/gpu/src/cuda/bf_match.cu b/modules/gpu/src/cuda/bf_match.cu
index a2e1923..e3372b3 100644
--- 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);
         const dim3 grid(divUp(query.rows, BLOCK_SIZE));
 
-        const size_t smemSize = (2 * BLOCK_SIZE * BLOCK_SIZE) * sizeof(int);
+        const size_t smemSize = (3 * BLOCK_SIZE * BLOCK_SIZE) * sizeof(int);
 
         match<BLOCK_SIZE, Dist><<<grid, block, smemSize, stream>>>(query, trains, n, mask, trainIdx.data, imgIdx.data, distance.data);
         cudaSafeCall( cudaGetLastError() );
@@ -561,7 +561,7 @@ namespace cv { namespace gpu { namespace bf_match
         {
             matchUnrolledCached<16, 128, Dist>(query, train, mask, trainIdx, distance, stream);
         }
-        else if (query.cols <= 256)
+        /*else if (query.cols <= 256)
         {
             matchUnrolled<16, 256, Dist>(query, train, mask, trainIdx, distance, stream);
         }
@@ -572,7 +572,7 @@ namespace cv { namespace gpu { namespace bf_match
         else if (query.cols <= 1024)
         {            
             matchUnrolled<16, 1024, Dist>(query, train, mask, trainIdx, distance, stream);
-        }
+        }*/
         else
         {
             match<16, Dist>(query, train, mask, trainIdx, distance, stream);
@@ -592,7 +592,7 @@ namespace cv { namespace gpu { namespace bf_match
         {
             matchUnrolledCached<16, 128, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);
         }
-        else if (query.cols <= 256)
+        /*else if (query.cols <= 256)
         {
             matchUnrolled<16, 256, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);
         }
@@ -603,7 +603,7 @@ namespace cv { namespace gpu { namespace bf_match
         else if (query.cols <= 1024)
         {            
             matchUnrolled<16, 1024, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);
-        }
+        }*/
         else
         {
             match<16, Dist>(query, trains, n, mask, trainIdx, imgIdx, distance, stream);
diff --git a/modules/gpu/src/cuda/bf_radius_match.cu b/modules/gpu/src/cuda/bf_radius_match.cu
index 58b2c8a..6dbaf85 100644
--- 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
         {
             matchUnrolled<16, 128, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);
         }
-        else if (query.cols <= 256)
+        /*else if (query.cols <= 256)
         {
             matchUnrolled<16, 256, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);
         }
@@ -294,7 +294,7 @@ namespace cv { namespace gpu { namespace bf_radius_match
         else if (query.cols <= 1024)
         {            
             matchUnrolled<16, 1024, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);
-        }
+        }*/
         else
         {
             match<16, Dist>(query, train, maxDistance, mask, trainIdx, distance, nMatches, stream);
@@ -314,7 +314,7 @@ namespace cv { namespace gpu { namespace bf_radius_match
         {
             matchUnrolled<16, 128, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);
         }
-        else if (query.cols <= 256)
+        /*else if (query.cols <= 256)
         {
             matchUnrolled<16, 256, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);
         }
@@ -325,7 +325,7 @@ namespace cv { namespace gpu { namespace bf_radius_match
         else if (query.cols <= 1024)
         {            
             matchUnrolled<16, 1024, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);
-        }
+        }*/
         else
         {
             match<16, Dist>(query, trains, n, maxDistance, masks, trainIdx, imgIdx, distance, nMatches, stream);