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

Using std::map in PlanCache

Browse Source
This commit is contained in:
Alexander Karsakov
2014-07-27 13:31:46 +04:00
parent 37d01e2d27
commit fecfaf4092
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/core/src/dxt.cpp
View File

@@ -43,6 +43,7 @@
#include "opencv2/core/opencl/runtime/opencl_clamdfft.hpp" #include "opencv2/core/opencl/runtime/opencl_clamdfft.hpp"
#include "opencv2/core/opencl/runtime/opencl_core.hpp" #include "opencv2/core/opencl/runtime/opencl_core.hpp"
#include "opencl_kernels.hpp" #include "opencl_kernels.hpp"
#include <map>
namespace cv namespace cv
{ {
@@ -1801,10 +1802,9 @@ private:
String buildOptions; String buildOptions;
int thread_count; int thread_count;
bool status; bool status;
public:
int dft_size; int dft_size;
public:
OCL_FftPlan(int _size): dft_size(_size), status(true) OCL_FftPlan(int _size): dft_size(_size), status(true)
{ {
int min_radix; int min_radix;
@@ -1999,19 +1999,18 @@ public:
Ptr<OCL_FftPlan> getFftPlan(int dft_size) Ptr<OCL_FftPlan> getFftPlan(int dft_size)
{ {
for (size_t i = 0, size = planStorage.size(); i < size; ++i) std::map<int, Ptr<OCL_FftPlan> >::iterator f = planStorage.find(dft_size);
if (f != planStorage.end())
{ {
Ptr<OCL_FftPlan> plan = planStorage[i]; return f->second;
if (plan->dft_size == dft_size) }
else
{ {
return plan;
}
}
Ptr<OCL_FftPlan> newPlan = Ptr<OCL_FftPlan>(new OCL_FftPlan(dft_size)); Ptr<OCL_FftPlan> newPlan = Ptr<OCL_FftPlan>(new OCL_FftPlan(dft_size));
planStorage.push_back(newPlan); planStorage[dft_size] = newPlan;
return newPlan; return newPlan;
} }
}
~OCL_FftPlanCache() ~OCL_FftPlanCache()
{ {
@@ -2023,8 +2022,7 @@ protected:
planStorage() planStorage()
{ {
} }
std::map<int, Ptr<OCL_FftPlan> > planStorage;
std::vector<Ptr<OCL_FftPlan> > planStorage;
}; };
static bool ocl_dft_rows(InputArray _src, OutputArray _dst, int nonzero_rows, int flags, int fftType) static bool ocl_dft_rows(InputArray _src, OutputArray _dst, int nonzero_rows, int flags, int fftType)