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

Merge pull request #1106 from pengx17:2.4_gftt_rename

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-07-11 11:41:37 +04:00 committed by OpenCV Buildbot
commit d1fe1a62c3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ocl/src/gfft.cpp → modules/ocl/src/gftt.cpp
View File

@ -55,7 +55,7 @@ namespace cv
namespace ocl namespace ocl
{ {
///////////////////////////OpenCL kernel strings/////////////////////////// ///////////////////////////OpenCL kernel strings///////////////////////////
extern const char *imgproc_gfft; extern const char *imgproc_gftt;
} }
} }
@ -133,7 +133,7 @@ struct Sorter<BITONIC>
for(int passOfStage = 0; passOfStage < stage + 1; ++passOfStage) for(int passOfStage = 0; passOfStage < stage + 1; ++passOfStage)
{ {
args[4] = std::make_pair(sizeof(cl_int), (void *)&passOfStage); args[4] = std::make_pair(sizeof(cl_int), (void *)&passOfStage);
openCLExecuteKernel(cxt, &imgproc_gfft, kernelname, globalThreads, localThreads, args, -1, -1); openCLExecuteKernel(cxt, &imgproc_gftt, kernelname, globalThreads, localThreads, args, -1, -1);
} }
} }
} }
@ -160,12 +160,12 @@ struct Sorter<SELECTION>
args.push_back( std::make_pair( sizeof(cl_int), (void*)&count) ); args.push_back( std::make_pair( sizeof(cl_int), (void*)&count) );
args.push_back( std::make_pair( lds_size, (void*)NULL) ); args.push_back( std::make_pair( lds_size, (void*)NULL) );
openCLExecuteKernel(cxt, &imgproc_gfft, kernelname, globalThreads, localThreads, args, -1, -1); openCLExecuteKernel(cxt, &imgproc_gftt, kernelname, globalThreads, localThreads, args, -1, -1);
//final //final
kernelname = "sortCorners_selectionSortFinal"; kernelname = "sortCorners_selectionSortFinal";
args.pop_back(); args.pop_back();
openCLExecuteKernel(cxt, &imgproc_gfft, kernelname, globalThreads, localThreads, args, -1, -1); openCLExecuteKernel(cxt, &imgproc_gftt, kernelname, globalThreads, localThreads, args, -1, -1);
} }
}; };
@ -201,7 +201,7 @@ int findCorners_caller(
size_t localThreads[3] = {16, 16, 1}; size_t localThreads[3] = {16, 16, 1};
const char * opt = mask.empty() ? "" : "-D WITH_MASK"; const char * opt = mask.empty() ? "" : "-D WITH_MASK";
openCLExecuteKernel(cxt, &imgproc_gfft, kernelname, globalThreads, localThreads, args, -1, -1, opt); openCLExecuteKernel(cxt, &imgproc_gftt, kernelname, globalThreads, localThreads, args, -1, -1, opt);
return std::min(Mat(g_counter).at<int>(0), max_count); return std::min(Mat(g_counter).at<int>(0), max_count);
} }
}//unnamed namespace }//unnamed namespace

0
modules/ocl/src/opencl/imgproc_gfft.cl → modules/ocl/src/opencl/imgproc_gftt.cl
View File