generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor refactoring of gpu module

Browse Source
This commit is contained in:
Alexey Spizhevoy 2010-12-07 06:45:54 +00:00
parent ed934ed6fc
commit 19b434be50
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/include/opencv2/gpu/gpu.hpp
View File

@ -1261,13 +1261,15 @@ namespace cv
class CV_EXPORTS BruteForceMatcher_GPU< L1<T> > : public BruteForceMatcher_GPU_base
{
public:
explicit BruteForceMatcher_GPU(L1<T> d = L1<T>()) : BruteForceMatcher_GPU_base(L1Dist) {}
explicit BruteForceMatcher_GPU() : BruteForceMatcher_GPU_base(L1Dist) {}
explicit BruteForceMatcher_GPU(L1<T> /*d*/) : BruteForceMatcher_GPU_base(L1Dist) {}
};
template <typename T>
class CV_EXPORTS BruteForceMatcher_GPU< L2<T> > : public BruteForceMatcher_GPU_base
{
public:
explicit BruteForceMatcher_GPU(L2<T> d = L2<T>()) : BruteForceMatcher_GPU_base(L2Dist) {}
explicit BruteForceMatcher_GPU() : BruteForceMatcher_GPU_base(L2Dist) {}
explicit BruteForceMatcher_GPU(L2<T> /*d*/) : BruteForceMatcher_GPU_base(L2Dist) {}
};
}

5
tests/gpu/src/gputest_main.cpp
View File

@ -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. */