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

Removed whitespace.

Browse Source
This commit is contained in:
Jin Ma 2013-09-09 17:00:33 +08:00
parent 2d5a1dacd0
commit a4ab3f4ea8
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/ocl/src/kalman.cpp
View File

@ -48,7 +48,7 @@ using namespace std;
using namespace cv; using namespace cv;
using namespace cv::ocl; using namespace cv::ocl;
KalmanFilter::KalmanFilter() KalmanFilter::KalmanFilter()
{ {
} }
@ -66,7 +66,7 @@ void KalmanFilter::init(int DP, int MP, int CP, int type)
statePre.create(DP, 1, type); statePre.create(DP, 1, type);
statePre.setTo(Scalar::all(0)); statePre.setTo(Scalar::all(0));
statePost.create(DP, 1, type); statePost.create(DP, 1, type);
statePost.setTo(Scalar::all(0)); statePost.setTo(Scalar::all(0));
@ -111,7 +111,7 @@ CV_EXPORTS const oclMat& KalmanFilter::predict(const oclMat& control)
gemm(transitionMatrix, statePost, 1, oclMat(), 0, statePre); gemm(transitionMatrix, statePost, 1, oclMat(), 0, statePre);
oclMat temp; oclMat temp;
if(control.data) if(control.data)
gemm(controlMatrix, control, 1, statePre, 1, statePre); gemm(controlMatrix, control, 1, statePre, 1, statePre);
gemm(transitionMatrix, errorCovPost, 1, oclMat(), 0, temp1); gemm(transitionMatrix, errorCovPost, 1, oclMat(), 0, temp1);
gemm(temp1, transitionMatrix, 1, processNoiseCov, 1, errorCovPre, GEMM_2_T); gemm(temp1, transitionMatrix, 1, processNoiseCov, 1, errorCovPre, GEMM_2_T);

5
modules/ocl/test/test_kalman.cpp
View File

@ -96,7 +96,7 @@ TEST_P(Kalman, Accuracy)
kalman_filter_ocl.correct(Sample); kalman_filter_ocl.correct(Sample);
//ocl end //ocl end
//cpu start //cpu start
cv::KalmanFilter kalman_filter_cpu; cv::KalmanFilter kalman_filter_cpu;
kalman_filter_cpu.init(Dim, Dim); kalman_filter_cpu.init(Dim, Dim);
@ -143,5 +143,4 @@ TEST_P(Kalman, Accuracy)
} }
INSTANTIATE_TEST_CASE_P(OCL_Video, Kalman, Combine(Values(3, 7), Values(30))); INSTANTIATE_TEST_CASE_P(OCL_Video, Kalman, Combine(Values(3, 7), Values(30)));
#endif // HAVE_OPENCL #endif // HAVE_OPENCL