Merge pull request #8876 from alalek:fix_build_msvs

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)

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<int>(pow(static_cast<float>(ONE_SIZE), dims));
+    EXPECT_EQ(expected, cv::countNonZero(data));
 }
 
 INSTANTIATE_TEST_CASE_P(Core, CountNonZeroND,