mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 07:43:03 +04:00
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
This commit is contained in:
Alexander Alekhin
@@ -4,7 +4,7 @@ Cross referencing OpenCV from other Doxygen projects {#tutorial_cross_referencin
|
||||
Cross referencing OpenCV
|
||||
------------------------
|
||||
|
||||
[Doxygen](https://www.stack.nl/~dimitri/doxygen/) is a tool to generate
|
||||
[Doxygen](http://www.doxygen.nl) is a tool to generate
|
||||
documentations like the OpenCV documentation you are reading right now.
|
||||
It is used by a variety of software projects and if you happen to use it
|
||||
to generate your own documentation, and you are using OpenCV inside your
|
||||
@@ -57,5 +57,5 @@ contain a `your_project.tag` file in its root directory.
|
||||
References
|
||||
----------
|
||||
|
||||
- [Doxygen: Linking to external documentation](https://www.stack.nl/~dimitri/doxygen/manual/external.html)
|
||||
- [Doxygen: Linking to external documentation](http://www.doxygen.nl/manual/external.html)
|
||||
- [opencv.tag](opencv.tag)
|
||||
|
||||
@@ -684,12 +684,12 @@ References {#tutorial_documentation_refs}
|
||||
- [Command reference] - supported commands and their parameters
|
||||
|
||||
<!-- invisible references list -->
|
||||
[Doxygen]: http://www.stack.nl/~dimitri/doxygen/index.html)
|
||||
[Doxygen download]: http://www.stack.nl/~dimitri/doxygen/download.html
|
||||
[Doxygen installation]: http://www.stack.nl/~dimitri/doxygen/manual/install.html
|
||||
[Documenting basics]: http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html
|
||||
[Markdown support]: http://www.stack.nl/~dimitri/doxygen/manual/markdown.html
|
||||
[Formulas support]: http://www.stack.nl/~dimitri/doxygen/manual/formulas.html
|
||||
[Doxygen]: http://www.doxygen.nl
|
||||
[Doxygen download]: http://doxygen.nl/download.html
|
||||
[Doxygen installation]: http://doxygen.nl/manual/install.html
|
||||
[Documenting basics]: http://www.doxygen.nl/manual/docblocks.html
|
||||
[Markdown support]: http://www.doxygen.nl/manual/markdown.html
|
||||
[Formulas support]: http://www.doxygen.nl/manual/formulas.html
|
||||
[Supported formula commands]: http://docs.mathjax.org/en/latest/tex.html#supported-latex-commands
|
||||
[Command reference]: http://www.stack.nl/~dimitri/doxygen/manual/commands.html
|
||||
[Command reference]: http://www.doxygen.nl/manual/commands.html
|
||||
[Google Scholar]: http://scholar.google.ru/
|
||||
|
||||
@@ -9,7 +9,7 @@ Required Packages
|
||||
|
||||
### Getting the Cutting-edge OpenCV from Git Repository
|
||||
|
||||
Launch GIT client and clone OpenCV repository from [here](http://github.com/opencv/opencv)
|
||||
Launch Git client and clone OpenCV repository from [GitHub](http://github.com/opencv/opencv).
|
||||
|
||||
In MacOS it can be done using the following command in Terminal:
|
||||
|
||||
@@ -18,24 +18,48 @@ cd ~/<my_working _directory>
|
||||
git clone https://github.com/opencv/opencv.git
|
||||
@endcode
|
||||
|
||||
If you want to install OpenCV’s extra modules, clone the opencv_contrib repository as well:
|
||||
|
||||
@code{.bash}
|
||||
cd ~/<my_working _directory>
|
||||
git clone https://github.com/opencv/opencv_contrib.git
|
||||
@endcode
|
||||
|
||||
|
||||
Building OpenCV from Source, using CMake and Command Line
|
||||
---------------------------------------------------------
|
||||
|
||||
-# Make symbolic link for Xcode to let OpenCV build scripts find the compiler, header files etc.
|
||||
1. Make sure the xcode command line tools are installed:
|
||||
@code{.bash}
|
||||
cd /
|
||||
sudo ln -s /Applications/Xcode.app/Contents/Developer Developer
|
||||
xcode-select --install
|
||||
@endcode
|
||||
|
||||
-# Build OpenCV framework:
|
||||
2. Build OpenCV framework:
|
||||
@code{.bash}
|
||||
cd ~/<my_working_directory>
|
||||
python opencv/platforms/ios/build_framework.py ios
|
||||
@endcode
|
||||
|
||||
If everything's fine, a few minutes later you will get
|
||||
\~/\<my_working_directory\>/ios/opencv2.framework. You can add this framework to your Xcode
|
||||
projects.
|
||||
3. To install OpenCV’s extra modules, append `--contrib opencv_contrib` to the python command above. **Note:** the extra modules are not included in the iOS Pack download at [OpenCV Releases](https://opencv.org/releases/). If you want to use the extra modules (e.g. aruco), you must build OpenCV yourself and include this option:
|
||||
@code{.bash}
|
||||
cd ~/<my_working_directory>
|
||||
python opencv/platforms/ios/build_framework.py ios --contrib opencv_contrib
|
||||
@endcode
|
||||
|
||||
4. To exclude a specific module, append `--without <module_name>`. For example, to exclude the "optflow" module from opencv_contrib:
|
||||
@code{.bash}
|
||||
cd ~/<my_working_directory>
|
||||
python opencv/platforms/ios/build_framework.py ios --contrib opencv_contrib --without optflow
|
||||
@endcode
|
||||
|
||||
5. The build process can take a significant amount of time. Currently (OpenCV 3.4 and 4.1), five separate architectures are built: armv7, armv7s, and arm64 for iOS plus i386 and x86_64 for the iPhone simulator. If you want to specify the architectures to include in the framework, use the `--iphoneos_archs` and/or `--iphonesimulator_archs` options. For example, to only build arm64 for iOS and x86_64 for the simulator:
|
||||
@code{.bash}
|
||||
cd ~/<my_working_directory>
|
||||
python opencv/platforms/ios/build_framework.py ios --contrib opencv_contrib --iphoneos_archs arm64 --iphonesimulator_archs x86_64
|
||||
@endcode
|
||||
|
||||
If everything’s fine, the build process will create
|
||||
`~/<my_working_directory>/ios/opencv2.framework`. You can add this framework to your Xcode projects.
|
||||
|
||||
Further Reading
|
||||
---------------
|
||||
|
||||
@@ -114,7 +114,7 @@ Additionally you can find very basic sample source code to introduce you to the
|
||||
|
||||
_Compatibility:_ \> OpenCV 2.4.2
|
||||
|
||||
_Author:_ Artem Myagkov, Eduard Feicho
|
||||
_Author:_ Artem Myagkov, Eduard Feicho, Steve Nicholson
|
||||
|
||||
We will learn how to setup OpenCV for using it in iOS!
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@ of them, you need to download and install them on your system.
|
||||
image file format.
|
||||
- The OpenNI Framework contains a set of open source APIs that provide support for natural interaction with devices via methods such as voice command recognition, hand gestures, and body
|
||||
motion tracking. Prebuilt binaries can be found [here](http://structure.io/openni). The source code of [OpenNI](https://github.com/OpenNI/OpenNI) and [OpenNI2](https://github.com/OpenNI/OpenNI2) are also available on Github.
|
||||
- [Doxygen](http://www.stack.nl/~dimitri/doxygen/) is a documentation generator and is the tool that will actually create the
|
||||
- [Doxygen](http://www.doxygen.nl) is a documentation generator and is the tool that will actually create the
|
||||
*OpenCV documentation*.
|
||||
|
||||
Now we will describe the steps to follow for a full build (using all the above frameworks, tools and
|
||||
|
||||
Reference in New Issue
Block a user