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

possibility to enable /mp compiler flag from cmake

Browse Source 
fixed MCVC warnings
This commit is contained in:
Anatoly Baksheev
2012-08-23 14:05:25 +04:00
parent 5648e49d59
commit 290030d030
9 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/src/graphcuts.cpp
View File

@@ -63,15 +63,11 @@ namespace cv { namespace gpu { namespace device
}
}}}
float4 scalarToCudaType(const cv::Scalar& in)
static float4 scalarToCudaType(const cv::Scalar& in)
{
float4 res;
res.x = in[0]; res.y = in[1]; res.z = in[2]; res.w = in[3];
return res;
return make_float4((float)in[0], (float)in[1], (float)in[2], (float)in[3]);
}
void cv::gpu::connectivityMask(const GpuMat& image, GpuMat& mask, const cv::Scalar& lo, const cv::Scalar& hi, Stream& s)
{
CV_Assert(!image.empty());