diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp index 6655af159..0e7cc5778 100644 --- a/modules/gpu/include/opencv2/gpu/gpu.hpp +++ b/modules/gpu/include/opencv2/gpu/gpu.hpp @@ -1261,13 +1261,15 @@ namespace cv class CV_EXPORTS BruteForceMatcher_GPU< L1 > : public BruteForceMatcher_GPU_base { public: - explicit BruteForceMatcher_GPU(L1 d = L1()) : BruteForceMatcher_GPU_base(L1Dist) {} + explicit BruteForceMatcher_GPU() : BruteForceMatcher_GPU_base(L1Dist) {} + explicit BruteForceMatcher_GPU(L1 /*d*/) : BruteForceMatcher_GPU_base(L1Dist) {} }; template class CV_EXPORTS BruteForceMatcher_GPU< L2 > : public BruteForceMatcher_GPU_base { public: - explicit BruteForceMatcher_GPU(L2 d = L2()) : BruteForceMatcher_GPU_base(L2Dist) {} + explicit BruteForceMatcher_GPU() : BruteForceMatcher_GPU_base(L2Dist) {} + explicit BruteForceMatcher_GPU(L2 /*d*/) : BruteForceMatcher_GPU_base(L2Dist) {} }; } diff --git a/tests/gpu/src/gputest_main.cpp b/tests/gpu/src/gputest_main.cpp index 917ce9ae1..a634ef0ed 100644 --- a/tests/gpu/src/gputest_main.cpp +++ b/tests/gpu/src/gputest_main.cpp @@ -56,10 +56,7 @@ const char* blacklist[] = int main( int argc, char** argv ) { - argc = 3; - const char* manargs[] = { "gputest", "-tn", "GPU-MatchTemplateTest"}; - - return test_system.run( argc, (char**)manargs, blacklist ); + return test_system.run( argc, argv, blacklist ); } /* End of file. */