Skip to content

xfeatures2d: fix compilation error on MSVS #2591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2020
Merged

xfeatures2d: fix compilation error on MSVS #2591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions modules/xfeatures2d/test/test_surf.cuda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down