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

fixed compilation error under linux

Browse Source
This commit is contained in:
Vladislav Vinogradov
2012-02-22 11:22:31 +00:00
parent 2d30480982
commit f0f87ebf36
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/src/element_operations.cpp
View File

@@ -654,11 +654,9 @@ void cv::gpu::multiply(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, doub
namespace
{
bool isIntScalar(Scalar sc)
inline bool isIntScalar(Scalar sc)
{
Scalar_<int> isc(sc);
return sc.val[0] == isc.val[0] && sc.val[1] == isc.val[1] && sc.val[2] == isc.val[2] && sc.val[3] == isc.val[3];
return sc.val[0] == static_cast<int>(sc.val[0]) && sc.val[1] == static_cast<int>(sc.val[1]) && sc.val[2] == static_cast<int>(sc.val[2]) && sc.val[3] == static_cast<int>(sc.val[3]);
}
}