1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

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

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
+2 -2
View File
@@ -3065,7 +3065,7 @@ void invertAffineTransform(const Mat& matM, Mat& _iM)
{
const float* M = (const float*)matM.data;
float* iM = (float*)_iM.data;
int step = matM.step/sizeof(M[0]), istep = _iM.step/sizeof(iM[0]);
int step = (int)(matM.step/sizeof(M[0])), istep = (int)(_iM.step/sizeof(iM[0]));
double D = M[0]*M[step+1] - M[1]*M[step];
D = D != 0 ? 1./D : 0;
@@ -3080,7 +3080,7 @@ void invertAffineTransform(const Mat& matM, Mat& _iM)
{
const double* M = (const double*)matM.data;
double* iM = (double*)_iM.data;
int step = matM.step/sizeof(M[0]), istep = _iM.step/sizeof(iM[0]);
int step = (int)(matM.step/sizeof(M[0])), istep = (int)(_iM.step/sizeof(iM[0]));
double D = M[0]*M[step+1] - M[1]*M[step];
D = D != 0 ? 1./D : 0;