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

removed compatibility headers

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-07-23 13:19:54 +04:00
parent fef646d4f8
commit 91dd44e7fa
20 changed files with 40 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/gpu/brox_optical_flow.cpp
View File

@@ -6,7 +6,9 @@
#include "opencv2/core.hpp"
#include "opencv2/core/utility.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/gpu.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/gpuoptflow.hpp"
#include "opencv2/gpuarithm.hpp"
using namespace std;
using namespace cv;
@@ -161,7 +163,7 @@ int main(int argc, const char* argv[])
interpolateFrames(d_r, d_rt, d_fu, d_fv, d_bu, d_bv, timePos, d_rNew, d_buf);
GpuMat channels3[] = {d_bNew, d_gNew, d_rNew};
merge(channels3, 3, d_newFrame);
cuda::merge(channels3, 3, d_newFrame);
frames.push_back(Mat(d_newFrame));