From 781515c5146a90dfd9ab0fc02c634705b5fdd1fe Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 8 Jun 2017 00:40:35 +0300 Subject: [PATCH 1/2] build: fix "ambiguous call" (MSVS2010) --- modules/core/test/test_countnonzero.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/core/test/test_countnonzero.cpp b/modules/core/test/test_countnonzero.cpp index d1360d3eb8..862307ca4e 100644 --- a/modules/core/test/test_countnonzero.cpp +++ b/modules/core/test/test_countnonzero.cpp @@ -267,7 +267,8 @@ TEST_P (CountNonZeroND, ndim) data = 0; EXPECT_EQ(0, cv::countNonZero(data)); data = Scalar::all(1); - EXPECT_EQ(pow(ONE_SIZE, dims), cv::countNonZero(data)); + int expected = static_cast(pow(static_cast(ONE_SIZE), dims)); + EXPECT_EQ(expected, cv::countNonZero(data)); } INSTANTIATE_TEST_CASE_P(Core, CountNonZeroND, From 5c0a287ce84bb89ada75a222c01dfd9f9583c10d Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 8 Jun 2017 01:49:09 +0300 Subject: [PATCH 2/2] build: fix warning C4189: 'clImageUV' : local variable is initialized but not referenced --- modules/core/src/directx.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/src/directx.cpp b/modules/core/src/directx.cpp index 23a7b94c69..2ea168705d 100644 --- a/modules/core/src/directx.cpp +++ b/modules/core/src/directx.cpp @@ -794,7 +794,9 @@ void convertToD3D11Texture2D(InputArray src, ID3D11Texture2D* pD3D11Texture2D) cl_int status = 0; cl_mem clImage = 0; +#ifdef HAVE_DIRECTX_NV12 cl_mem clImageUV = 0; +#endif clImage = clCreateFromD3D11Texture2DKHR(context, CL_MEM_WRITE_ONLY, pD3D11Texture2D, 0, &status); if (status != CL_SUCCESS)