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

Fix Windows build issues

Browse Source 
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
This commit is contained in:
Andrey Kamaev
2012-08-22 03:59:05 +04:00
parent 793e8b546d
commit f2a02feffa
12 changed files with 49 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/gpu/perf/perf_imgproc.cpp
View File

@@ -23,8 +23,8 @@ void generateMap(cv::Mat& map_x, cv::Mat& map_y, int remapMode)
case HALF_SIZE:
if (i > map_x.cols*0.25 && i < map_x.cols*0.75 && j > map_x.rows*0.25 && j < map_x.rows*0.75)
{
map_x.at<float>(j,i) = 2 * (i - map_x.cols * 0.25) + 0.5;
map_y.at<float>(j,i) = 2 * (j - map_x.rows * 0.25) + 0.5;
map_x.at<float>(j,i) = 2 * (i - map_x.cols * 0.25f) + 0.5f;
map_y.at<float>(j,i) = 2 * (j - map_x.rows * 0.25f) + 0.5f;
}
else
{
@@ -33,16 +33,16 @@ void generateMap(cv::Mat& map_x, cv::Mat& map_y, int remapMode)
}
break;
case UPSIDE_DOWN:
map_x.at<float>(j,i) = i;
map_y.at<float>(j,i) = map_x.rows - j;
map_x.at<float>(j,i) = static_cast<float>(i);
map_y.at<float>(j,i) = static_cast<float>(map_x.rows - j);
break;
case REFLECTION_X:
map_x.at<float>(j,i) = map_x.cols - i;
map_y.at<float>(j,i) = j;
map_x.at<float>(j,i) = static_cast<float>(map_x.cols - i);
map_y.at<float>(j,i) = static_cast<float>(j);
break;
case REFLECTION_BOTH:
map_x.at<float>(j,i) = map_x.cols - i;
map_y.at<float>(j,i) = map_x.rows - j;
map_x.at<float>(j,i) = static_cast<float>(map_x.cols - i);
map_y.at<float>(j,i) = static_cast<float>(map_x.rows - j);
break;
} // end of switch
}
@@ -1619,7 +1619,7 @@ PERF_TEST_P(Sz_DoSort, ImgProc_HoughLines, Combine(GPU_TYPICAL_MAT_SIZES, Bool()
const bool doSort = GET_PARAM(1);
const float rho = 1.0f;
const float theta = CV_PI / 180.0f;
const float theta = static_cast<float>(CV_PI / 180.0);
const int threshold = 300;
cv::RNG rng(123456789);

9
modules/gpu/perf/perf_labeling.cpp
View File

@@ -31,6 +31,11 @@ struct GreedyLabeling
int d = a - b;
return lo <= d && d <= hi;
}
private:
InInterval& operator=(const InInterval&);
};
GreedyLabeling(cv::Mat img)
@@ -45,7 +50,7 @@ struct GreedyLabeling
int cc = -1;
int* dist_labels = (int*)labels.data;
int pitch = labels.step1();
int pitch = static_cast<int>(labels.step1());
unsigned char* source = (unsigned char*)image.data;
int width = image.cols;
@@ -82,7 +87,7 @@ struct GreedyLabeling
*top++ = dot::make(p.x, p.y + 1);
//top
if( p.y > 0 && dl[-pitch] == -1 && inInt(sp[0], sp[-image.step1()]))
if( p.y > 0 && dl[-pitch] == -1 && inInt(sp[0], sp[-static_cast<int>(image.step1())]))
*top++ = dot::make(p.x, p.y - 1);
p = *--top;

2
modules/gpu/perf/perf_video.cpp
View File

@@ -427,7 +427,7 @@ PERF_TEST_P(Video_Cn_LearningRate, Video_MOG, Combine(Values("gpu/video/768x576.
{
string inputFile = perf::TestBase::getDataPath(GET_PARAM(0));
int cn = GET_PARAM(1);
double learningRate = GET_PARAM(2);
float learningRate = static_cast<float>(GET_PARAM(2));
cv::VideoCapture cap(inputFile);
ASSERT_TRUE(cap.isOpened());