Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
c92ecc7f
Commit
c92ecc7f
authored
Aug 20, 2017
by
KUANG Fangjun
Committed by
Alexander Alekhin
Oct 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the documentation.
parent
ae52d94c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
CMakeLists.txt
CMakeLists.txt
+2
-2
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+5
-5
OpenCVVersion.cmake
cmake/OpenCVVersion.cmake
+2
-2
utility_and_system_functions_and_macros.rst
modules/core/doc/utility_and_system_functions_and_macros.rst
+6
-6
No files found.
CMakeLists.txt
View file @
c92ecc7f
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
if
(
"
${
CMAKE_SOURCE_DIR
}
"
STREQUAL
"
${
CMAKE_BINARY_DIR
}
"
)
if
(
"
${
CMAKE_SOURCE_DIR
}
"
STREQUAL
"
${
CMAKE_BINARY_DIR
}
"
)
message
(
FATAL_ERROR
"
message
(
FATAL_ERROR
"
FATAL: In-source builds are not allowed.
FATAL: In-source builds are not allowed.
You should create separate directory for build files.
You should create
a
separate directory for build files.
"
)
"
)
endif
()
endif
()
...
@@ -189,7 +189,7 @@ OCV_OPTION(BUILD_PACKAGE "Enables 'make package_source' command"
...
@@ -189,7 +189,7 @@ OCV_OPTION(BUILD_PACKAGE "Enables 'make package_source' command"
OCV_OPTION
(
BUILD_PERF_TESTS
"Build performance tests"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
BUILD_PERF_TESTS
"Build performance tests"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
BUILD_TESTS
"Build accuracy & regression tests"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
BUILD_TESTS
"Build accuracy & regression tests"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
BUILD_WITH_DEBUG_INFO
"Include debug info into debug libs (not MSCV only)"
ON
)
OCV_OPTION
(
BUILD_WITH_DEBUG_INFO
"Include debug info into debug libs (not MSCV only)"
ON
)
OCV_OPTION
(
BUILD_WITH_STATIC_CRT
"Enables use of staticaly linked CRT for staticaly linked OpenCV"
ON IF MSVC
)
OCV_OPTION
(
BUILD_WITH_STATIC_CRT
"Enables use of statical
l
y linked CRT for staticaly linked OpenCV"
ON IF MSVC
)
OCV_OPTION
(
BUILD_FAT_JAVA_LIB
"Create fat java wrapper containing the whole OpenCV library"
ON IF NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX
)
OCV_OPTION
(
BUILD_FAT_JAVA_LIB
"Create fat java wrapper containing the whole OpenCV library"
ON IF NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX
)
OCV_OPTION
(
BUILD_ANDROID_SERVICE
"Build OpenCV Manager for Google Play"
OFF IF ANDROID AND ANDROID_SOURCE_TREE
)
OCV_OPTION
(
BUILD_ANDROID_SERVICE
"Build OpenCV Manager for Google Play"
OFF IF ANDROID AND ANDROID_SOURCE_TREE
)
OCV_OPTION
(
BUILD_ANDROID_PACKAGE
"Build platform-specific package for Google Play"
OFF IF ANDROID
)
OCV_OPTION
(
BUILD_ANDROID_PACKAGE
"Build platform-specific package for Google Play"
OFF IF ANDROID
)
...
...
cmake/OpenCVUtils.cmake
View file @
c92ecc7f
...
@@ -5,8 +5,8 @@ if(UNIX)
...
@@ -5,8 +5,8 @@ if(UNIX)
find_package
(
PkgConfig
)
find_package
(
PkgConfig
)
endif
()
endif
()
# Search packages for host system instead of packages for target system
# Search packages for
the
host system instead of packages for target system
# in case of cross compilation thes
s macro should be defined by
toolchain file
# in case of cross compilation thes
e macros should be defined by the
toolchain file
if
(
NOT COMMAND find_host_package
)
if
(
NOT COMMAND find_host_package
)
macro
(
find_host_package
)
macro
(
find_host_package
)
find_package
(
${
ARGN
}
)
find_package
(
${
ARGN
}
)
...
@@ -82,7 +82,7 @@ macro(ocv_check_environment_variables)
...
@@ -82,7 +82,7 @@ macro(ocv_check_environment_variables)
endforeach
()
endforeach
()
endmacro
()
endmacro
()
# adds include directories in such way that directories from the OpenCV source tree go first
# adds include directories in such
a
way that directories from the OpenCV source tree go first
function
(
ocv_include_directories
)
function
(
ocv_include_directories
)
set
(
__add_before
""
)
set
(
__add_before
""
)
foreach
(
dir
${
ARGN
}
)
foreach
(
dir
${
ARGN
}
)
...
@@ -337,7 +337,7 @@ macro(ocv_check_modules define)
...
@@ -337,7 +337,7 @@ macro(ocv_check_modules define)
endmacro
()
endmacro
()
# Macro
s that checks if module have
been installed.
# Macro
that checks if module has
been installed.
# After it adds module to build and define
# After it adds module to build and define
# constants passed as second arg
# constants passed as second arg
macro
(
CHECK_MODULE module_name define
)
macro
(
CHECK_MODULE module_name define
)
...
@@ -526,7 +526,7 @@ macro(ocv_list_add_suffix LST SUFFIX)
...
@@ -526,7 +526,7 @@ macro(ocv_list_add_suffix LST SUFFIX)
endmacro
()
endmacro
()
# gets and removes the first element from list
# gets and removes the first element from
the
list
macro
(
ocv_list_pop_front LST VAR
)
macro
(
ocv_list_pop_front LST VAR
)
if
(
${
LST
}
)
if
(
${
LST
}
)
list
(
GET
${
LST
}
0
${
VAR
}
)
list
(
GET
${
LST
}
0
${
VAR
}
)
...
...
cmake/OpenCVVersion.cmake
View file @
c92ecc7f
...
@@ -14,6 +14,6 @@ endif()
...
@@ -14,6 +14,6 @@ endif()
set
(
OPENCV_SOVERSION
"
${
OPENCV_VERSION_MAJOR
}
.
${
OPENCV_VERSION_MINOR
}
"
)
set
(
OPENCV_SOVERSION
"
${
OPENCV_VERSION_MAJOR
}
.
${
OPENCV_VERSION_MINOR
}
"
)
set
(
OPENCV_LIBVERSION
"
${
OPENCV_VERSION_MAJOR
}
.
${
OPENCV_VERSION_MINOR
}
.
${
OPENCV_VERSION_PATCH
}
"
)
set
(
OPENCV_LIBVERSION
"
${
OPENCV_VERSION_MAJOR
}
.
${
OPENCV_VERSION_MINOR
}
.
${
OPENCV_VERSION_PATCH
}
"
)
# create a dependency on version file
# create a dependency on
the
version file
# we never use output of the following command but cmake will rerun automatically if the version file changes
# we never use
the
output of the following command but cmake will rerun automatically if the version file changes
configure_file
(
"
${
OPENCV_VERSION_FILE
}
"
"
${
CMAKE_BINARY_DIR
}
/junk/version.junk"
COPYONLY
)
configure_file
(
"
${
OPENCV_VERSION_FILE
}
"
"
${
CMAKE_BINARY_DIR
}
/junk/version.junk"
COPYONLY
)
modules/core/doc/utility_and_system_functions_and_macros.rst
View file @
c92ecc7f
...
@@ -31,7 +31,7 @@ Aligns a buffer size to the specified number of bytes.
...
@@ -31,7 +31,7 @@ Aligns a buffer size to the specified number of bytes.
:param n: Alignment size that must be a power of two.
:param n: Alignment size that must be a power of two.
The function returns the minimum number that is greater or equal to ``sz`` and is divisible by ``n`` :
The function returns the minimum number that is greater
than
or equal to ``sz`` and is divisible by ``n`` :
.. math::
.. math::
...
@@ -363,7 +363,7 @@ Always returns 0 if called outside of parallel region.
...
@@ -363,7 +363,7 @@ Always returns 0 if called outside of parallel region.
.. ocv:function:: int getThreadNum()
.. ocv:function:: int getThreadNum()
The exact meaning of return value depends on the threading framework used by OpenCV library:
The exact meaning of
the
return value depends on the threading framework used by OpenCV library:
* **TBB** – Unsupported with current 4.1 TBB release. May be will be supported in future.
* **TBB** – Unsupported with current 4.1 TBB release. May be will be supported in future.
* **OpenMP** – The thread number, within the current team, of the calling thread.
* **OpenMP** – The thread number, within the current team, of the calling thread.
...
@@ -450,7 +450,7 @@ This operation is used in the simplest or most complex image processing function
...
@@ -450,7 +450,7 @@ This operation is used in the simplest or most complex image processing function
setNumThreads
setNumThreads
-----------------
-----------------
OpenCV will try to set the number of threads for the next parallel region.
OpenCV will try to set the number of threads for the next parallel region.
If ``threads == 0``, OpenCV will disable threading optimizations and run all it
'
s
If ``threads == 0``, OpenCV will disable threading optimizations and run all its
functions sequentially. Passing ``threads < 0`` will reset threads number to system default.
functions sequentially. Passing ``threads < 0`` will reset threads number to system default.
This function must be called outside of parallel region.
This function must be called outside of parallel region.
...
@@ -458,14 +458,14 @@ This function must be called outside of parallel region.
...
@@ -458,14 +458,14 @@ This function must be called outside of parallel region.
:param nthreads: Number of threads used by OpenCV.
:param nthreads: Number of threads used by OpenCV.
OpenCV will try to run it
'
s functions with specified threads number, but
OpenCV will try to run its functions with specified threads number, but
some behaviour differs from framework:
some behaviour differs from framework:
* **TBB** – User-defined parallel constructions will run with the same threads number,
* **TBB** – User-defined parallel constructions will run with the same threads number,
if another
does not specified. If late on user create
s own scheduler, OpenCV will be use it.
if another
is not specified. If late on user creates hi
s own scheduler, OpenCV will be use it.
* **OpenMP** – No special defined behaviour.
* **OpenMP** – No special defined behaviour.
* **Concurrency** – If ``threads == 1``, OpenCV will disable threading optimizations
* **Concurrency** – If ``threads == 1``, OpenCV will disable threading optimizations
and run it
'
s functions sequentially.
and run its functions sequentially.
* **GCD** – Supports only values <= 0.
* **GCD** – Supports only values <= 0.
* **C=** – No special defined behaviour.
* **C=** – No special defined behaviour.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment