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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/test/test_imgwarp.cpp
View File

@@ -347,7 +347,7 @@ static void test_remap( const Mat& src, Mat& dst, const Mat& mapx, const Mat& ma
uchar* sptr0 = src.data;
int depth = src.depth(), cn = src.channels();
int elem_size = (int)src.elemSize();
int step = src.step / CV_ELEM_SIZE(depth);
int step = (int)(src.step / CV_ELEM_SIZE(depth));
int delta;
if( interpolation != CV_INTER_CUBIC )
@@ -1100,7 +1100,7 @@ void CV_UndistortMapTest::prepare_to_validation( int )
static void
test_getQuadrangeSubPix( const Mat& src, Mat& dst, double* a )
{
int sstep = src.step / sizeof(float);
int sstep = (int)(src.step / sizeof(float));
int scols = src.cols, srows = src.rows;
CV_Assert( src.depth() == CV_32F && src.type() == dst.type() );