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

Move cv::Size_

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-26 20:23:40 +04:00
parent 13b31b0804
commit addf0309ec
12 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/legacy/src/optflowbm.cpp
View File

@@ -75,11 +75,10 @@ cvCalcOpticalFlowBM( const void* srcarrA, const void* srcarrB,
if( !CV_ARE_TYPES_EQ( velx, vely ))
CV_Error( CV_StsUnmatchedFormats, "Destination images have different formats" );
CvSize velSize =
{
CvSize velSize(
(srcA->width - blockSize.width + shiftSize.width)/shiftSize.width,
(srcA->height - blockSize.height + shiftSize.height)/shiftSize.height
};
);
if( !CV_ARE_SIZES_EQ( srcA, srcB ) ||
!CV_ARE_SIZES_EQ( velx, vely ) ||

4
modules/legacy/src/pyrsegmentation.cpp
View File

@@ -287,7 +287,7 @@ icvPyrSegmentation8uC1R( uchar * src_image, int src_step,
/* calculate initial pyramid */
for( l = 1; l <= level; l++ )
{
CvSize dst_size = { size.width/2+1, size.height/2+1 };
CvSize dst_size(size.width/2+1, size.height/2+1);
CvMat prev_level = cvMat( size.height, size.width, CV_32FC1 );
CvMat next_level = cvMat( dst_size.height, dst_size.width, CV_32FC1 );
@@ -706,7 +706,7 @@ icvPyrSegmentation8uC3R( uchar * src_image, int src_step,
/* calculate initial pyramid */
for( l = 1; l <= level; l++ )
{
CvSize dst_size = { size.width/2 + 1, size.height/2 + 1 };
CvSize dst_size(size.width/2 + 1, size.height/2 + 1);
CvMat prev_level = cvMat( size.height, size.width, CV_32FC3 );
CvMat next_level = cvMat( dst_size.height, dst_size.width, CV_32FC3 );

4
modules/legacy/src/testseq.cpp
View File

@@ -850,13 +850,13 @@ CvTestSeq* cvCreateTestSeq(char* pConfigfile, char** videos, int numvideo, float
{ /* Calculate elements and image size and video length: */
CvTestSeqElem* p = pTS->pElemList;
int num = 0;
CvSize MaxSize = {0,0};
CvSize MaxSize;
int MaxFN = 0;
for(p = pTS->pElemList; p; p=p->next, num++)
{
int FN = p->FrameBegin+p->FrameNum;
CvSize S = {0,0};
CvSize S;
if(p->pImg && p->BG)
{

2
modules/legacy/src/vecfacetracking.cpp
View File

@@ -157,7 +157,7 @@ struct CvFaceTracker
};
int InitNextImage(IplImage* img)
{
CvSize sz = {img->width, img->height};
CvSize sz(img->width, img->height);
ReallocImage(&imgGray, sz, 1);
ReallocImage(&imgThresh, sz, 1);
ptRotate = face[MOUTH].ptCenter;

2
modules/legacy/test/test_pyrsegmentation.cpp
View File

@@ -86,7 +86,7 @@ void CV_PyrSegmentationTest::run( int /*start_from*/ )
int i, j, iter;
IplImage *image, *image_f, *image_s;
CvSize size = {128, 128};
CvSize size(128, 128);
const int threshold1 = 50, threshold2 = 50;
rect[1].width = size.width;