potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge branch '2.4'

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-05 19:52:42 +04:00
parent 3785439917 74e5ff2ec7
commit 67073daf19
154 changed files with 11355 additions and 16795 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/gpu/super_resolution.cpp
+1 -2
View File
@@ -48,8 +48,7 @@ static Ptr<DenseOpticalFlowExt> createOptFlow(const string& name, bool useGpu)
{
cerr << "Incorrect Optical Flow algorithm - " << name << endl;
}
return Ptr<DenseOpticalFlowExt>();
return 0;
}
int main(int argc, const char* argv[])