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

fifixed compile problem on VS2010 64-bit. fixed L1 and L2 distances

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-25 10:05:03 +00:00
parent 48183f10e7
commit b7e9c6229b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -1782,10 +1782,10 @@ struct CV_EXPORTS Accumulator
typedef T Type; typedef T Type;
}; };
template<> struct Accumulator<unsigned char> { typedef unsigned int Type; }; template<> struct Accumulator<unsigned char> { typedef float Type; };
template<> struct Accumulator<unsigned short> { typedef unsigned int Type; }; template<> struct Accumulator<unsigned short> { typedef float Type; };
template<> struct Accumulator<char> { typedef int Type; }; template<> struct Accumulator<char> { typedef float Type; };
template<> struct Accumulator<short> { typedef int Type; }; template<> struct Accumulator<short> { typedef float Type; };
/* /*
* Squared Euclidean distance functor * Squared Euclidean distance functor
@ -1823,7 +1823,7 @@ struct CV_EXPORTS L1
for( int i = 0; i < size; i++ ) for( int i = 0; i < size; i++ )
{ {
ResultType diff = a[i] - b[i]; ResultType diff = a[i] - b[i];
result += fabs( diff ); result += (ResultType)fabs( diff );
} }
return result; return result;
} }