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

Fix gcc build error introduced in a9f36df

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-10 13:23:39 +04:00
parent cabddaeb4f
commit 006a4ba529
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,9 @@ The references are:
#define VERIFY_CORNERS 0 #define VERIFY_CORNERS 0
void cv::makeOffsets(int pixel[25], int rowStride, int patternSize) namespace cv {
void makeOffsets(int pixel[25], int rowStride, int patternSize)
{ {
static const int offsets16[][2] = static const int offsets16[][2] =
{ {
@ -115,7 +117,7 @@ static void testCorner(const uchar* ptr, const int pixel[], int K, int N, int th
#endif #endif
template<> template<>
int cv::cornerScore<16>(const uchar* ptr, const int pixel[], int threshold) int cornerScore<16>(const uchar* ptr, const int pixel[], int threshold)
{ {
const int K = 8, N = K*3 + 1; const int K = 8, N = K*3 + 1;
int k, v = ptr[0]; int k, v = ptr[0];
@ -205,7 +207,7 @@ int cv::cornerScore<16>(const uchar* ptr, const int pixel[], int threshold)
} }
template<> template<>
int cv::cornerScore<12>(const uchar* ptr, const int pixel[], int threshold) int cornerScore<12>(const uchar* ptr, const int pixel[], int threshold)
{ {
const int K = 6, N = K*3 + 1; const int K = 6, N = K*3 + 1;
int k, v = ptr[0]; int k, v = ptr[0];
@ -289,7 +291,7 @@ int cv::cornerScore<12>(const uchar* ptr, const int pixel[], int threshold)
} }
template<> template<>
int cv::cornerScore<8>(const uchar* ptr, const int pixel[], int threshold) int cornerScore<8>(const uchar* ptr, const int pixel[], int threshold)
{ {
const int K = 4, N = K*3 + 1; const int K = 4, N = K*3 + 1;
int k, v = ptr[0]; int k, v = ptr[0];
@ -354,3 +356,5 @@ int cv::cornerScore<8>(const uchar* ptr, const int pixel[], int threshold)
return threshold; return threshold;
} }
} // namespace cv