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

Fix MSVC build issues

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-30 00:47:22 +04:00
parent 2b1ef95415
commit 71e43852ce
10 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ocl/src/haar.cpp
View File

@@ -931,10 +931,10 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
std::vector<float> scalev;
for(factor = 1.f;; factor *= scaleFactor)
{
CvSize winSize = { cvRound(winSize0.width * factor), cvRound(winSize0.height * factor) };
CvSize winSize( cvRound(winSize0.width * factor), cvRound(winSize0.height * factor) );
sz.width = cvRound( gimg.cols / factor ) + 1;
sz.height = cvRound( gimg.rows / factor ) + 1;
CvSize sz1 = { sz.width - winSize0.width - 1, sz.height - winSize0.height - 1 };
CvSize sz1( sz.width - winSize0.width - 1, sz.height - winSize0.height - 1 );
if( sz1.width <= 0 || sz1.height <= 0 )
break;
@@ -1158,9 +1158,7 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
cvRound(factor * winsize0.height) < gimg.rows - 10;
n_factors++, factor *= scaleFactor )
{
CvSize winSize = { cvRound( winsize0.width * factor ),
cvRound( winsize0.height * factor )
};
CvSize winSize( cvRound( winsize0.width * factor ), cvRound( winsize0.height * factor ) );
if( winSize.width < minSize.width || winSize.height < minSize.height )
{
continue;
@@ -1320,7 +1318,7 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
if( findBiggestObject && rectList.size() )
{
CvAvgComp result_comp = {{0, 0, 0, 0}, 0};
CvAvgComp result_comp = {CvRect(), 0};
for( size_t i = 0; i < rectList.size(); i++ )
{

2
modules/ocl/src/matrix_operations.cpp
View File

@@ -927,7 +927,7 @@ void cv::ocl::oclMat::createEx(int _rows, int _cols, int _type, DevMemRW rw_type
{
clCxt = Context::getContext();
/* core logic */
_type &= TYPE_MASK;
_type &= Mat::TYPE_MASK;
//download_channels = CV_MAT_CN(_type);
//if(download_channels==3)
//{

2
modules/ocl/src/moments.cpp
View File

@@ -265,7 +265,7 @@ static void ocl_cvMoments( const void* array, CvMoments* mom, int binary )
if( size.width <= 0 || size.height <= 0 )
return;
cv::Mat src0(mat);
cv::Mat src0 = cv::cvarrToMat(mat);
cv::ocl::oclMat src(src0);
cv::Size tileSize;
int blockx,blocky;