potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages 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
modules/imgproc/src/imgwarp.cpp
+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;
modules/imgproc/src/rotcalipers.cpp
+2 -26
View File
@@ -364,7 +364,7 @@ cvMinAreaRect2( const CvArr* array, CvMemStorage* storage )
if( CV_IS_SEQ(ptseq) )
{
if( !CV_IS_SEQ_POINT_SET(ptseq) &&
(CV_SEQ_KIND(ptseq) != CV_SEQ_KIND_CURVE || !CV_IS_SEQ_CONVEX(ptseq) ||
(CV_SEQ_KIND(ptseq) != CV_SEQ_KIND_CURVE ||
CV_SEQ_ELTYPE(ptseq) != CV_SEQ_ELTYPE_PPOINT ))
CV_Error( CV_StsUnsupportedFormat,
"Input sequence must consist of 2d points or pointers to 2d points" );
@@ -385,31 +385,7 @@ cvMinAreaRect2( const CvArr* array, CvMemStorage* storage )
temp_storage = cvCreateMemStorage(1 << 10);
}
if( !CV_IS_SEQ_CONVEX( ptseq ))
{
ptseq = cvConvexHull2( ptseq, temp_storage, CV_CLOCKWISE, 1 );
}
else if( !CV_IS_SEQ_POINT_SET( ptseq ))
{
CvSeqWriter writer;
if( !CV_IS_SEQ(ptseq->v_prev) || !CV_IS_SEQ_POINT_SET(ptseq->v_prev))
CV_Error( CV_StsBadArg,
"Convex hull must have valid pointer to point sequence stored in v_prev" );
cvStartReadSeq( ptseq, &reader );
cvStartWriteSeq( CV_SEQ_KIND_CURVE|CV_SEQ_FLAG_CONVEX|CV_SEQ_ELTYPE(ptseq->v_prev),
sizeof(CvContour), CV_ELEM_SIZE(ptseq->v_prev->flags),
temp_storage, &writer );
for( i = 0; i < ptseq->total; i++ )
{
CvPoint pt = **(CvPoint**)(reader.ptr);
CV_WRITE_SEQ_ELEM( pt, writer );
}
ptseq = cvEndWriteSeq( &writer );
}
ptseq = cvConvexHull2( ptseq, temp_storage, CV_CLOCKWISE, 1 );
n = ptseq->total;
_points.allocate(n);
modules/imgproc/src/segmentation.cpp
+4 -4
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,