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

Merge pull request #6217 from krrishnarraj:master

Browse Source
This commit is contained in:
Alexander Alekhin 2016-03-09 09:42:17 +00:00
commit a7d28f3b1f
7 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/flann/include/opencv2/flann/any.h
View File

@ -79,7 +79,8 @@ struct big_any_policy : typed_base_any_policy<T>
{
virtual void static_delete(void** x)
{
if (* x) delete (* reinterpret_cast<T**>(x)); *x = NULL;
if (* x) delete (* reinterpret_cast<T**>(x));
*x = NULL;
}
virtual void copy_from_value(void const* src, void** dest)
{

6
modules/ts/src/ts_func.cpp
View File

@ -1772,7 +1772,8 @@ cmpUlpsFlt_(const int* src1, const int* src2, size_t total, int imaxdiff, size_t
for( i = 0; i < total; i++ )
{
int a = src1[i], b = src2[i];
if( a < 0 ) a ^= C; if( b < 0 ) b ^= C;
if( a < 0 ) a ^= C;
if( b < 0 ) b ^= C;
int diff = std::abs(a - b);
if( realmaxdiff < diff )
{
@ -1794,7 +1795,8 @@ cmpUlpsFlt_(const int64* src1, const int64* src2, size_t total, int imaxdiff, si
for( i = 0; i < total; i++ )
{
int64 a = src1[i], b = src2[i];
if( a < 0 ) a ^= C; if( b < 0 ) b ^= C;
if( a < 0 ) a ^= C;
if( b < 0 ) b ^= C;
double diff = fabs((double)a - (double)b);
if( realmaxdiff < diff )
{