Merge pull request opencv#8876 from alalek:fix_build_msvs

alalek · alalek · commit e3c0d11b5527 · 2017-06-08T19:53:29.000Z
diff --git 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)
diff --git 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<int>(pow(static_cast<float>(ONE_SIZE), dims));
+    EXPECT_EQ(expected, cv::countNonZero(data));
 }
 
 INSTANTIATE_TEST_CASE_P(Core, CountNonZeroND,

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,8 @@ TEST_P (CountNonZeroND, ndim)`
`267`	`267`	`data = 0;`
`268`	`268`	`EXPECT_EQ(0, cv::countNonZero(data));`
`269`	`269`	`data = Scalar::all(1);`
`270`		`- EXPECT_EQ(pow(ONE_SIZE, dims), cv::countNonZero(data));`
	`270`	`+ int expected = static_cast<int>(pow(static_cast<float>(ONE_SIZE), dims));`
	`271`	`+ EXPECT_EQ(expected, cv::countNonZero(data));`
`271`	`272`	`}`
`272`	`273`
`273`	`274`	`INSTANTIATE_TEST_CASE_P(Core, CountNonZeroND,`