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

8
modules/imgproc/src/segmentation.cpp
View File

@@ -384,7 +384,7 @@ cvPyrMeanShiftFiltering( const CvArr* srcarr, CvArr* dstarr,
cv::Mat src = src_pyramid[level];
cv::Size size = src.size();
uchar* sptr = src.data;
int sstep = src.step;
int sstep = (int)src.step;
uchar* mask = 0;
int mstep = 0;
uchar* dptr;
@@ -396,9 +396,9 @@ cvPyrMeanShiftFiltering( const CvArr* srcarr, CvArr* dstarr,
{
cv::Size size1 = dst_pyramid[level+1].size();
cv::Mat m( size.height, size.width, CV_8UC1, mask0.data );
dstep = dst_pyramid[level+1].step;
dstep = (int)dst_pyramid[level+1].step;
dptr = dst_pyramid[level+1].data + dstep + cn;
mstep = m.step;
mstep = (int)m.step;
mask = m.data + mstep;
//cvResize( dst_pyramid[level+1], dst_pyramid[level], CV_INTER_CUBIC );
cv::pyrUp( dst_pyramid[level+1], dst_pyramid[level] );
@@ -419,7 +419,7 @@ cvPyrMeanShiftFiltering( const CvArr* srcarr, CvArr* dstarr,
}
dptr = dst_pyramid[level].data;
dstep = dst_pyramid[level].step;
dstep = (int)dst_pyramid[level].step;
for( i = 0; i < size.height; i++, sptr += sstep - size.width*3,
dptr += dstep - size.width*3,