From de211bf96e6a08a4cf995b444fd785f276d6dd81 Mon Sep 17 00:00:00 2001
From: Tomoaki Teshima <tomoaki.teshima@gmail.com>
Date: Tue, 7 Jul 2020 08:47:03 +0900
Subject: [PATCH] fix compilation error on MSVS

---
 modules/xfeatures2d/test/test_surf.cuda.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/xfeatures2d/test/test_surf.cuda.cpp b/modules/xfeatures2d/test/test_surf.cuda.cpp
index 71c3b632b..f2624f304 100644
--- a/modules/xfeatures2d/test/test_surf.cuda.cpp
+++ b/modules/xfeatures2d/test/test_surf.cuda.cpp
@@ -171,15 +171,22 @@ CUDA_TEST_P(CUDA_SURF, Descriptor)
     EXPECT_GT(matchedRatio, 0.6);
 }
 
-INSTANTIATE_TEST_CASE_P(CUDA_Features2D, CUDA_SURF, testing::Combine(
-    testing::Values(
 #if defined (__x86_64__) || defined (_M_X64)
-            SURF_HessianThreshold(100.0), SURF_HessianThreshold(500.0),
+testing::internal::ValueArray3<SURF_HessianThreshold, SURF_HessianThreshold, SURF_HessianThreshold> thresholdValues =
+    testing::Values(
+            SURF_HessianThreshold(100.0),
+            SURF_HessianThreshold(500.0),
+            SURF_HessianThreshold(1000.0));
 #else
-            // hessian computation is not bit-exact and lower threshold causes difference count of detection
+// hessian computation is not bit-exact and lower threshold causes different count of detection
+internal::ValueArray2<SURF_HessianThreshold, SURF_HessianThreshold> thresholdValues =
+    testing::Values(
             SURF_HessianThreshold(813.0),
+            SURF_HessianThreshold(1000.0));
 #endif
-            SURF_HessianThreshold(1000.0)),
+
+INSTANTIATE_TEST_CASE_P(CUDA_Features2D, CUDA_SURF, testing::Combine(
+    thresholdValues,
     testing::Values(SURF_Octaves(3), SURF_Octaves(4)),
     testing::Values(SURF_OctaveLayers(2), SURF_OctaveLayers(3)),
     testing::Values(SURF_Extended(false), SURF_Extended(true)),