mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
peng xiao 2013-06-26 17:24:09 +08:00
parent 132b885b24
commit 9270205947
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ocl/perf/perf_opticalflow.cpp
View File

@ -293,12 +293,10 @@ PERFTEST(FarnebackOpticalFlow)
std::vector<cv::Mat> flowxy; std::vector<cv::Mat> flowxy;
cv::split(flow, flowxy); cv::split(flow, flowxy);
double diff0 = 0.0; Mat md_flowx = cv::Mat(d_flowx);
TestSystem::instance().setAccurate(ExceptedMatSimilar(flowxy[0], cv::Mat(d_flowx), 0.1, diff0)); Mat md_flowy = cv::Mat(d_flowy);
TestSystem::instance().setDiff(diff0); TestSystem::instance().ExceptedMatSimilar(flowxy[0], md_flowx, 0.1);
double diff1 = 0.0; TestSystem::instance().ExceptedMatSimilar(flowxy[1], md_flowy, 0.1);
TestSystem::instance().setAccurate(ExceptedMatSimilar(flowxy[1], cv::Mat(d_flowy), 0.1, diff1));
TestSystem::instance().setDiff(diff1);
if (useInitFlow) if (useInitFlow)
{ {

12
modules/ocl/src/optical_flow_farneback.cpp
View File

@ -82,7 +82,7 @@ namespace cv { namespace ocl { namespace optflow_farneback
gKer.upload(t_gKer); gKer.upload(t_gKer);
} }
void gaussianBlurOcl(const oclMat &src, int ksizeHalf, oclMat &dst) static void gaussianBlurOcl(const oclMat &src, int ksizeHalf, oclMat &dst)
{ {
string kernelName("gaussianBlur"); string kernelName("gaussianBlur");
size_t localThreads[3] = { 256, 1, 1 }; size_t localThreads[3] = { 256, 1, 1 };
@ -105,7 +105,7 @@ namespace cv { namespace ocl { namespace optflow_farneback
globalThreads, localThreads, args, -1, -1); globalThreads, localThreads, args, -1, -1);
} }
void polynomialExpansionOcl(const oclMat &src, int polyN, oclMat &dst) static void polynomialExpansionOcl(const oclMat &src, int polyN, oclMat &dst)
{ {
string kernelName("polynomialExpansion"); string kernelName("polynomialExpansion");
size_t localThreads[3] = { 256, 1, 1 }; size_t localThreads[3] = { 256, 1, 1 };
@ -132,7 +132,7 @@ namespace cv { namespace ocl { namespace optflow_farneback
globalThreads, localThreads, args, -1, -1, opt); globalThreads, localThreads, args, -1, -1, opt);
} }
void updateMatricesOcl(const oclMat &flowx, const oclMat &flowy, const oclMat &R0, const oclMat &R1, oclMat &M) static void updateMatricesOcl(const oclMat &flowx, const oclMat &flowy, const oclMat &R0, const oclMat &R1, oclMat &M)
{ {
string kernelName("updateMatrices"); string kernelName("updateMatrices");
size_t localThreads[3] = { 32, 8, 1 }; size_t localThreads[3] = { 32, 8, 1 };
@ -158,7 +158,7 @@ namespace cv { namespace ocl { namespace optflow_farneback
globalThreads, localThreads, args, -1, -1); globalThreads, localThreads, args, -1, -1);
} }
void boxFilter5Ocl(const oclMat &src, int ksizeHalf, oclMat &dst) static void boxFilter5Ocl(const oclMat &src, int ksizeHalf, oclMat &dst)
{ {
string kernelName("boxFilter5"); string kernelName("boxFilter5");
int height = src.rows / 5; int height = src.rows / 5;
@ -180,7 +180,7 @@ namespace cv { namespace ocl { namespace optflow_farneback
globalThreads, localThreads, args, -1, -1); globalThreads, localThreads, args, -1, -1);
} }
void updateFlowOcl(const oclMat &M, oclMat &flowx, oclMat &flowy) static void updateFlowOcl(const oclMat &M, oclMat &flowx, oclMat &flowy)
{ {
string kernelName("updateFlow"); string kernelName("updateFlow");
int cols = divUp(flowx.cols, 4); int cols = divUp(flowx.cols, 4);
@ -203,7 +203,7 @@ namespace cv { namespace ocl { namespace optflow_farneback
globalThreads, localThreads, args, -1, -1); globalThreads, localThreads, args, -1, -1);
} }
void gaussianBlur5Ocl(const oclMat &src, int ksizeHalf, oclMat &dst) static void gaussianBlur5Ocl(const oclMat &src, int ksizeHalf, oclMat &dst)
{ {
string kernelName("gaussianBlur5"); string kernelName("gaussianBlur5");
int height = src.rows / 5; int height = src.rows / 5;