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

updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-07-16 12:54:53 +00:00
parent 0c9eca7922
commit f78a3b4cc1
465 changed files with 51856 additions and 41344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cxcore/src/aarray.cpp
View File

@@ -279,7 +279,7 @@ void CV_ArrayOpTest::run( int /* start_from */)
M.copyTo(Md);
SparseMat M3; SparseMat(Md).convertTo(M3, Md.type(), 2);
int nz1 = M.nzcount(), nz2 = M3.nzcount();
int nz1 = (int)M.nzcount(), nz2 = (int)M3.nzcount();
double norm0 = norm(M, CV_C);
double norm1 = norm(M, CV_L1);
double norm2 = norm(M, CV_L2);
@@ -360,7 +360,7 @@ void CV_ArrayOpTest::run( int /* start_from */)
}
}
int nz = M.nzcount();
int nz = (int)M.nzcount();
if( nz != 0 )
{
errcount++;