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

fixed a few warnings reported by Oleg; restored SSE2 optimization in FAST

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-10-01 14:12:19 +04:00
parent dc568d4de1
commit 420dd22258
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/features2d/src/fast.cpp
View File

@ -89,7 +89,9 @@ void FAST_t(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, bo
if( i < img.rows - 3 )
{
j = 3;
#if 0 //CV_SSE2
#if CV_SSE2
if( patternSize == 16 )
{
for(; j < img.cols - 16 - 3; j += 16, ptr += 16)
{
__m128i m0, m1;
@ -145,6 +147,7 @@ void FAST_t(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, bo
curr[j+k] = (uchar)cornerScore<patternSize>(ptr+k, pixel, threshold);
}
}
}
#endif
for( ; j < img.cols - 3; j++, ptr++ )
{

2
modules/features2d/src/fast_score.cpp
View File

@ -78,6 +78,7 @@ void makeOffsets(int pixel[25], int rowStride, int patternSize)
pixel[k] = pixel[k - patternSize];
}
#if 0
static void testCorner(const uchar* ptr, const int pixel[], int K, int N, int threshold) {
// check that with the computed "threshold" the pixel is still a corner
// and that with the increased-by-1 "threshold" the pixel is not a corner anymore
@ -111,6 +112,7 @@ static void testCorner(const uchar* ptr, const int pixel[], int K, int N, int th
(delta == 1 && std::max(c0, c1) <= K) );
}
}
#endif
template<>
int cornerScore<16>(const uchar* ptr, const int pixel[], int threshold)

2
modules/highgui/src/cap_v4l.cpp
View File

@ -1432,7 +1432,7 @@ move_420_block(int yTL, int yTR, int yBL, int yBR, int u, int v,
static inline void
move_411_block(int yTL, int yTR, int yBL, int yBR, int u, int v,
int rowPixels, unsigned char * rgb)
int /*rowPixels*/, unsigned char * rgb)
{
const int rvScale = 91881;
const int guScale = -22553;