mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 23:33:05 +04:00
Merge pull request #9075 from TonyLianLong:master
Remove unnecessary Non-ASCII characters from source code (#9075) * Remove unnecessary Non-ASCII characters from source code Remove unnecessary Non-ASCII characters and replace them with ASCII characters * Remove dashes in the @param statement Remove dashes and place single space in the @param statement to keep coding style * misc: more fixes for non-ASCII symbols * misc: fix non-ASCII symbol in CMake file
This commit is contained in:
committed by
Alexander Alekhin
parent
9aaf6a66a3
commit
c8783f3e23
@@ -474,7 +474,7 @@ template<> CV_EXPORTS void DefaultDeleter<CvFileStorage>::operator ()(CvFileStor
|
||||
|
||||
The node is used to store each and every element of the file storage opened for reading. When
|
||||
XML/YAML file is read, it is first parsed and stored in the memory as a hierarchical collection of
|
||||
nodes. Each node can be a “leaf” that is contain a single number or a string, or be a collection of
|
||||
nodes. Each node can be a "leaf" that is contain a single number or a string, or be a collection of
|
||||
other nodes. There can be named collections (mappings) where each element has a name and it is
|
||||
accessed by a name, and ordered collections (sequences) where elements do not have names but rather
|
||||
accessed by index. Type of the file node can be determined using FileNode::type method.
|
||||
|
||||
@@ -200,13 +200,13 @@ be called outside of parallel region.
|
||||
|
||||
OpenCV will try to run it's functions with specified threads number, but some behaviour differs from
|
||||
framework:
|
||||
- `TBB` – User-defined parallel constructions will run with the same threads number, if
|
||||
- `TBB` - User-defined parallel constructions will run with the same threads number, if
|
||||
another does not specified. If later on user creates own scheduler, OpenCV will use it.
|
||||
- `OpenMP` – No special defined behaviour.
|
||||
- `Concurrency` – If threads == 1, OpenCV will disable threading optimizations and run it's
|
||||
- `OpenMP` - No special defined behaviour.
|
||||
- `Concurrency` - If threads == 1, OpenCV will disable threading optimizations and run it's
|
||||
functions sequentially.
|
||||
- `GCD` – Supports only values \<= 0.
|
||||
- `C=` – No special defined behaviour.
|
||||
- `GCD` - Supports only values \<= 0.
|
||||
- `C=` - No special defined behaviour.
|
||||
@param nthreads Number of threads used by OpenCV.
|
||||
@sa getNumThreads, getThreadNum
|
||||
*/
|
||||
@@ -217,13 +217,13 @@ CV_EXPORTS_W void setNumThreads(int nthreads);
|
||||
Always returns 1 if OpenCV is built without threading support.
|
||||
|
||||
The exact meaning of return value depends on the threading framework used by OpenCV library:
|
||||
- `TBB` – The number of threads, that OpenCV will try to use for parallel regions. If there is
|
||||
- `TBB` - The number of threads, that OpenCV will try to use for parallel regions. If there is
|
||||
any tbb::thread_scheduler_init in user code conflicting with OpenCV, then function returns
|
||||
default number of threads used by TBB library.
|
||||
- `OpenMP` – An upper bound on the number of threads that could be used to form a new team.
|
||||
- `Concurrency` – The number of threads, that OpenCV will try to use for parallel regions.
|
||||
- `GCD` – Unsupported; returns the GCD thread pool limit (512) for compatibility.
|
||||
- `C=` – The number of threads, that OpenCV will try to use for parallel regions, if before
|
||||
- `OpenMP` - An upper bound on the number of threads that could be used to form a new team.
|
||||
- `Concurrency` - The number of threads, that OpenCV will try to use for parallel regions.
|
||||
- `GCD` - Unsupported; returns the GCD thread pool limit (512) for compatibility.
|
||||
- `C=` - The number of threads, that OpenCV will try to use for parallel regions, if before
|
||||
called setNumThreads with threads \> 0, otherwise returns the number of logical CPUs,
|
||||
available for the process.
|
||||
@sa setNumThreads, getThreadNum
|
||||
@@ -234,12 +234,12 @@ CV_EXPORTS_W int getNumThreads();
|
||||
returns 0 if called outside of parallel region.
|
||||
|
||||
The exact meaning of return value depends on the threading framework used by OpenCV library:
|
||||
- `TBB` – Unsupported with current 4.1 TBB release. Maybe will be supported in future.
|
||||
- `OpenMP` – The thread number, within the current team, of the calling thread.
|
||||
- `Concurrency` – An ID for the virtual processor that the current context is executing on (0
|
||||
- `TBB` - Unsupported with current 4.1 TBB release. Maybe will be supported in future.
|
||||
- `OpenMP` - The thread number, within the current team, of the calling thread.
|
||||
- `Concurrency` - An ID for the virtual processor that the current context is executing on (0
|
||||
for master thread and unique number for others, but not necessary 1,2,3,...).
|
||||
- `GCD` – System calling thread's ID. Never returns 0 inside parallel region.
|
||||
- `C=` – The index of the current parallel task.
|
||||
- `GCD` - System calling thread's ID. Never returns 0 inside parallel region.
|
||||
- `C=` - The index of the current parallel task.
|
||||
@sa setNumThreads, getNumThreads
|
||||
*/
|
||||
CV_EXPORTS_W int getThreadNum();
|
||||
|
||||
Reference in New Issue
Block a user