mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 09:25:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4

Browse Source
This commit is contained in:
yao 2013-02-26 20:30:42 +08:00
commit 3ff5689fe5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ocl/src/fft.cpp
View File

@ -54,6 +54,9 @@ void cv::ocl::dft(const oclMat&, oclMat&, Size, int)
{
CV_Error(CV_StsNotImplemented, "OpenCL DFT is not implemented");
}
namespace cv { namespace ocl {
void fft_teardown(){}
}}
#else
#include "clAmdFft.h"
namespace cv

2
modules/ocl/src/initialization.cpp
View File

@ -65,6 +65,7 @@ namespace cv
{
namespace ocl
{
extern void fft_teardown();
/*
* The binary caching system to eliminate redundant program source compilation.
* Strictly, this is not a cache because we do not implement evictions right now.
@ -877,6 +878,7 @@ namespace cv
}
void Info::release()
{
fft_teardown();
if(impl->oclplatform)
{
impl->oclplatform = 0;