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

Update documentation

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-22 20:51:45 +04:00
parent be7bbe3aa9
commit 33ef7990b0
19 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/doc/initalization_and_information.rst
View File

@@ -110,7 +110,7 @@ Class providing functionality for querying the specified GPU properties. ::
DeviceInfo();
DeviceInfo(int device_id);
string name() const;
String name() const;
int majorVersion() const;
int minorVersion() const;
@@ -146,7 +146,7 @@ gpu::DeviceInfo::name
---------------------
Returns the device name.
.. ocv:function:: string gpu::DeviceInfo::name() const
.. ocv:function:: String gpu::DeviceInfo::name() const

8
modules/gpu/doc/object_detection.rst
View File

@@ -209,11 +209,11 @@ Cascade classifier class used for object detection. Supports HAAR and LBP cascad
{
public:
CascadeClassifier_GPU();
CascadeClassifier_GPU(const string& filename);
CascadeClassifier_GPU(const String& filename);
~CascadeClassifier_GPU();
bool empty() const;
bool load(const string& filename);
bool load(const String& filename);
void release();
/* Returns number of detected objects */
@@ -235,7 +235,7 @@ gpu::CascadeClassifier_GPU::CascadeClassifier_GPU
-----------------------------------------------------
Loads the classifier from a file. Cascade type is detected automatically by constructor parameter.
.. ocv:function:: gpu::CascadeClassifier_GPU::CascadeClassifier_GPU(const string& filename)
.. ocv:function:: gpu::CascadeClassifier_GPU::CascadeClassifier_GPU(const String& filename)
:param filename: Name of the file from which the classifier is loaded. Only the old ``haar`` classifier (trained by the ``haar`` training application) and NVIDIA's ``nvbin`` are supported for HAAR and only new type of OpenCV XML cascade supported for LBP.
@@ -253,7 +253,7 @@ gpu::CascadeClassifier_GPU::load
------------------------------------
Loads the classifier from a file. The previous content is destroyed.
.. ocv:function:: bool gpu::CascadeClassifier_GPU::load(const string& filename)
.. ocv:function:: bool gpu::CascadeClassifier_GPU::load(const String& filename)
:param filename: Name of the file from which the classifier is loaded. Only the old ``haar`` classifier (trained by the ``haar`` training application) and NVIDIA's ``nvbin`` are supported for HAAR and only new type of OpenCV XML cascade supported for LBP.