From 245ff93544f6843f5c7b0b7c88dcfb10ae61883d Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 8 Oct 2013 18:25:40 +0400 Subject: [PATCH] ocl setto fix for windows --- modules/ocl/src/matrix_operations.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/ocl/src/matrix_operations.cpp b/modules/ocl/src/matrix_operations.cpp index ed3a7ef..52250b2 100644 --- a/modules/ocl/src/matrix_operations.cpp +++ b/modules/ocl/src/matrix_operations.cpp @@ -362,8 +362,8 @@ static std::vector cvt2(const cv::Scalar & s) { std::vector _buf(sizeof(CLT)); CLT * const buf = reinterpret_cast(&_buf[0]); - buf->s0 = saturate_cast(s[0]); - buf->s1 = saturate_cast(s[1]); + buf->s[0] = saturate_cast(s[0]); + buf->s[1] = saturate_cast(s[1]); return _buf; } @@ -372,10 +372,10 @@ static std::vector cvt4(const cv::Scalar & s) { std::vector _buf(sizeof(CLT)); CLT * const buf = reinterpret_cast(&_buf[0]); - buf->s0 = saturate_cast(s[0]); - buf->s1 = saturate_cast(s[1]); - buf->s2 = saturate_cast(s[2]); - buf->s3 = saturate_cast(s[3]); + buf->s[0] = saturate_cast(s[0]); + buf->s[1] = saturate_cast(s[1]); + buf->s[2] = saturate_cast(s[2]); + buf->s[3] = saturate_cast(s[3]); return _buf; } @@ -428,7 +428,7 @@ static void set_to_withoutmask_run(const oclMat &dst, const Scalar &scalar, stri // run on OpenCL 1.1 platform if library binaries are compiled with OpenCL 1.2 support if (Context::getContext()->supportsFeature(FEATURE_CL_VER_1_2) && dst.isContinuous()) { - std::vector p = ::scalarToCLVector(scalar, dst.type()); + std::vector p = ::scalarToCLVector(scalar, CV_MAKE_TYPE(dst.depth(), dst.oclchannels())); clEnqueueFillBuffer(getClCommandQueue(dst.clCxt), (cl_mem)dst.data, (void*)&p[0], p.size(), 0, dst.step * dst.rows, 0, NULL, NULL); -- 2.7.4