hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors

This commit is contained in:
Vadim Pisarevsky
2013-10-22 17:41:28 +04:00
parent d8c8339bec
commit d3076c5014
6 changed files with 87 additions and 82 deletions

View File

@@ -57,7 +57,7 @@ class CV_EXPORTS Kernel;
class CV_EXPORTS Program;
class CV_EXPORTS ProgramSource;
class CV_EXPORTS Queue;
class CV_EXPORTS Device
{
public:
@@ -211,10 +211,9 @@ public:
bool create(int dtype);
size_t ndevices() const;
const Device& device(size_t idx) const;
int dtype() const;
Program getProg(const ProgramSource& prog,
const String& buildopt, String& errmsg);
static Context& getDefault();
void* ptr() const;
protected:
@@ -231,12 +230,12 @@ public:
~Queue();
Queue(const Queue& q);
Queue& operator = (const Queue& q);
bool create(const Context& c=Context(), const Device& d=Device());
void finish();
void* ptr() const;
static Queue& getDefault();
protected:
struct Impl;
Impl* p;
@@ -451,7 +450,7 @@ public:
const String& source() const;
hash_t hash() const;
protected:
struct Impl;
Impl* p;