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

temp build fix because the new core.hpp impact on this project

Browse Source
This commit is contained in:
niko 2012-08-20 10:06:41 +08:00
parent f17f4bda60
commit e7f4dd1a2e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,9 @@
//M*/
#include "precomp.hpp"
#include "Threadsafe.h"
#include "threadsafe.h"
#include <iomanip>
#include "binaryCaching.hpp"
#include "binarycaching.hpp"
using namespace cv;
using namespace cv::ocl;
@ -775,7 +775,7 @@ namespace cv
{
if(val == 0)
{
AutoLock al(&cs);
myAutoLock al(&cs);
if( NULL == clCxt.get())
clCxt.reset(new Context);

4
modules/ocl/src/threadsafe.cpp
View File

@ -43,8 +43,8 @@
//
//M*/
#include "precomp.hpp"
#include "Threadsafe.h"
//#include "precomp.hpp"
#include "threadsafe.h"
CriticalSection::CriticalSection()
{

6
modules/ocl/src/threadsafe.h
View File

@ -65,15 +65,15 @@ protected:
#endif
};
class AutoLock
class myAutoLock
{
public:
explicit AutoLock(CriticalSection *lock)
explicit myAutoLock(CriticalSection *lock)
{
m_lock = lock;
m_lock->Lock();
};
~AutoLock()
~myAutoLock()
{
m_lock->Unlock();
};