added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings

This commit is contained in:
Vadim Pisarevsky
2011-07-19 12:27:07 +00:00
parent 6bb1c07fd4
commit ff5e97c8e4
48 changed files with 443 additions and 385 deletions

View File

@@ -372,7 +372,7 @@ static void test_convertHomogeneous( const Mat& _src, Mat& _dst )
{
count = src.rows;
sdims = src.channels()*src.cols;
sstep1 = src.step/sizeof(double);
sstep1 = (int)(src.step/sizeof(double));
sstep2 = 1;
}
else
@@ -387,7 +387,7 @@ static void test_convertHomogeneous( const Mat& _src, Mat& _dst )
else
{
sstep1 = 1;
sstep2 = src.step/sizeof(double);
sstep2 = (int)(src.step/sizeof(double));
}
}
@@ -395,7 +395,7 @@ static void test_convertHomogeneous( const Mat& _src, Mat& _dst )
{
CV_Assert( count == dst.rows );
ddims = dst.channels()*dst.cols;
dstep1 = dst.step/sizeof(double);
dstep1 = (int)(dst.step/sizeof(double));
dstep2 = 1;
}
else
@@ -410,7 +410,7 @@ static void test_convertHomogeneous( const Mat& _src, Mat& _dst )
else
{
dstep1 = 1;
dstep2 = dst.step/sizeof(double);
dstep2 = (int)(dst.step/sizeof(double));
}
}