mirror of
https://github.com/opencv/opencv.git
synced 2025-06-08 01:53:19 +08:00
Merge pull request #24521 from dkurt:fix_broken_urls
Fix some of the broken urls in docs #24521 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
parent
ceebfa1bee
commit
53f2131681
@ -1,4 +1,4 @@
|
|||||||
Starting from OpenCV 4.5-pre (2020 August) OpenCV has changed the license from BSD to Apache 2. See https://opencv.org/opencv-is-to-change-the-license-to-apache-2/ and https://github.com/opencv/opencv/wiki/OE-32.--Change-OpenCV-License-to-Apache-2 for details.
|
Starting from OpenCV 4.5-pre (2020 August) OpenCV has changed the license from BSD to Apache 2. See https://opencv.org/blog/opencv-is-to-change-the-license-to-apache-2/ and https://github.com/opencv/opencv/wiki/OE-32.--Change-OpenCV-License-to-Apache-2 for details.
|
||||||
|
|
||||||
Here is the original OpenCV license:
|
Here is the original OpenCV license:
|
||||||
------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------
|
||||||
|
@ -54,7 +54,7 @@ repository](https://github.com/opencv/opencv.git).
|
|||||||
|
|
||||||
### Obtaining the Latest Stable OpenCV Version
|
### Obtaining the Latest Stable OpenCV Version
|
||||||
|
|
||||||
- Go to our [releases page](http://opencv.org/releases.html).
|
- Go to our [releases page](https://opencv.org/releases).
|
||||||
- Download the source archive and unpack it.
|
- Download the source archive and unpack it.
|
||||||
|
|
||||||
### Obtaining the Cutting-edge OpenCV from the Git Repository
|
### Obtaining the Cutting-edge OpenCV from the Git Repository
|
||||||
|
@ -111,7 +111,7 @@ frames per second (fps) and frame size should be passed. And the last one is the
|
|||||||
`True`, the encoder expect color frame, otherwise it works with grayscale frame.
|
`True`, the encoder expect color frame, otherwise it works with grayscale frame.
|
||||||
|
|
||||||
[FourCC](http://en.wikipedia.org/wiki/FourCC) is a 4-byte code used to specify the video codec. The
|
[FourCC](http://en.wikipedia.org/wiki/FourCC) is a 4-byte code used to specify the video codec. The
|
||||||
list of available codes can be found in [fourcc.org](http://www.fourcc.org/codecs.php). It is
|
list of available codes can be found in [fourcc.org](https://fourcc.org/codecs.php). It is
|
||||||
platform dependent. The following codecs work fine for me.
|
platform dependent. The following codecs work fine for me.
|
||||||
|
|
||||||
- In Fedora: DIVX, XVID, MJPG, X264, WMV1, WMV2. (XVID is more preferable. MJPG results in high
|
- In Fedora: DIVX, XVID, MJPG, X264, WMV1, WMV2. (XVID is more preferable. MJPG results in high
|
||||||
|
@ -245,7 +245,7 @@ In the following section, we will vectorize a simple convolution function for si
|
|||||||
|
|
||||||
You may learn more about convolution from the previous tutorial. We use the same naive implementation from the previous tutorial and compare it to the vectorized version.
|
You may learn more about convolution from the previous tutorial. We use the same naive implementation from the previous tutorial and compare it to the vectorized version.
|
||||||
|
|
||||||
The full tutorial code is [here](https://github.com/opencv/opencv/tree/4.x/samples/cpp/tutorial_code/univ_intrin/univ_intrin.cpp).
|
The full tutorial code is [here](https://github.com/opencv/opencv/tree/4.x/samples/cpp/tutorial_code/core/univ_intrin/univ_intrin.cpp).
|
||||||
|
|
||||||
### Vectorizing Convolution
|
### Vectorizing Convolution
|
||||||
|
|
||||||
|
@ -117,6 +117,6 @@ References
|
|||||||
- [SmartDeblur] - SmartDeblur site
|
- [SmartDeblur] - SmartDeblur site
|
||||||
|
|
||||||
<!-- invisible references list -->
|
<!-- invisible references list -->
|
||||||
[Digital Image Processing]: http://web.ipac.caltech.edu/staff/fmasci/home/astro_refs/Digital_Image_Processing_2ndEd.pdf
|
[Digital Image Processing]: http://web.ipac.caltech.edu/staff/fmasci/home/RefMaterial/ImageProc/Book_DigitalImageProcessing.pdf
|
||||||
[Image Deblurring in Matlab]: https://www.mathworks.com/help/images/image-deblurring.html
|
[Image Deblurring in Matlab]: https://www.mathworks.com/help/images/image-deblurring.html
|
||||||
[SmartDeblur]: http://yuzhikov.com/articles/BlurredImagesRestoration1.htm
|
[SmartDeblur]: http://yuzhikov.com/articles/BlurredImagesRestoration1.htm
|
||||||
|
@ -40,7 +40,7 @@ Getting the Source Code {#tutorial_building_tegra_cuda_getting_the_code}
|
|||||||
|
|
||||||
There are two (2) ways to get the OpenCV source code:
|
There are two (2) ways to get the OpenCV source code:
|
||||||
|
|
||||||
* Direct download from the [OpenCV downloads](http://opencv.org/releases.html) page
|
* Direct download from the [OpenCV downloads](https://opencv.org/releases) page
|
||||||
* Cloning the git repositories hosted on [GitHub](https://github.com/opencv)
|
* Cloning the git repositories hosted on [GitHub](https://github.com/opencv)
|
||||||
|
|
||||||
For this guide, the focus is on using the git repositories. This is because the 3.1.0 version of OpenCV will not build with CUDA 8.0 without applying a few small upstream changes from the git repository.
|
For this guide, the focus is on using the git repositories. This is because the 3.1.0 version of OpenCV will not build with CUDA 8.0 without applying a few small upstream changes from the git repository.
|
||||||
|
@ -21,7 +21,7 @@ less mistakes. Here we go.
|
|||||||
Configuring Eclipse
|
Configuring Eclipse
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
First, obtain a fresh release of OpenCV [from download page](http://opencv.org/releases.html) and
|
First, obtain a fresh release of OpenCV [from download page](https://opencv.org/releases) and
|
||||||
extract it under a simple location like `C:\OpenCV-2.4.6\`. I am using version 2.4.6, but the steps
|
extract it under a simple location like `C:\OpenCV-2.4.6\`. I am using version 2.4.6, but the steps
|
||||||
are more or less the same for other versions.
|
are more or less the same for other versions.
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ There are two methods of getting OpenCV sources:
|
|||||||
|
|
||||||
|
|
||||||
@note
|
@note
|
||||||
Snapshots of other branches, releases or commits can be found on the [GitHub](https://github.com/opencv/opencv) and the [official download page](https://opencv.org/releases.html).
|
Snapshots of other branches, releases or commits can be found on the [GitHub](https://github.com/opencv/opencv) and the [official download page](https://opencv.org/releases).
|
||||||
|
|
||||||
|
|
||||||
## Configure and build {#tutorial_linux_install_detailed_basic_build}
|
## Configure and build {#tutorial_linux_install_detailed_basic_build}
|
||||||
|
@ -53,7 +53,7 @@ You can use the latest stable OpenCV version or you can grab the latest snapshot
|
|||||||
|
|
||||||
### Getting the Latest Stable OpenCV Version
|
### Getting the Latest Stable OpenCV Version
|
||||||
|
|
||||||
- Go to our [downloads page](http://opencv.org/releases.html).
|
- Go to our [downloads page](https://opencv.org/releases).
|
||||||
- Download the source archive and unpack it.
|
- Download the source archive and unpack it.
|
||||||
|
|
||||||
### Getting the Cutting-edge OpenCV from the Git Repository
|
### Getting the Cutting-edge OpenCV from the Git Repository
|
||||||
|
@ -201,7 +201,7 @@ All specialized `ocl` implementations has been hidden behind general C++ algorit
|
|||||||
|
|
||||||
New class cv::UMat is intended to hide data exchange with OpenCL device in a convenient way.
|
New class cv::UMat is intended to hide data exchange with OpenCL device in a convenient way.
|
||||||
|
|
||||||
Following example illustrate API modifications (from [OpenCV site](http://opencv.org/platforms/opencl.html)):
|
Following example illustrate API modifications (from [OpenCV site](https://opencv.org/opencl)):
|
||||||
|
|
||||||
- OpenCL-aware code OpenCV-2.x
|
- OpenCL-aware code OpenCV-2.x
|
||||||
@code{.cpp}
|
@code{.cpp}
|
||||||
|
@ -1023,7 +1023,7 @@ public:
|
|||||||
VideoWriter::fourcc('P','I','M','1') is a MPEG-1 codec, VideoWriter::fourcc('M','J','P','G')
|
VideoWriter::fourcc('P','I','M','1') is a MPEG-1 codec, VideoWriter::fourcc('M','J','P','G')
|
||||||
is a motion-jpeg codec etc. List of codes can be obtained at
|
is a motion-jpeg codec etc. List of codes can be obtained at
|
||||||
[MSDN](https://docs.microsoft.com/en-us/windows/win32/medfound/video-fourccs) page
|
[MSDN](https://docs.microsoft.com/en-us/windows/win32/medfound/video-fourccs) page
|
||||||
or with this [archived page](https://web.archive.org/web/20220316062600/http://www.fourcc.org/codecs.php)
|
or with this [page](https://fourcc.org/codecs.php)
|
||||||
of the fourcc site for a more complete list). FFMPEG backend with MP4 container natively uses
|
of the fourcc site for a more complete list). FFMPEG backend with MP4 container natively uses
|
||||||
other values as fourcc code: see [ObjectType](http://mp4ra.org/#/codecs),
|
other values as fourcc code: see [ObjectType](http://mp4ra.org/#/codecs),
|
||||||
so you may receive a warning message from OpenCV about fourcc code conversion.
|
so you may receive a warning message from OpenCV about fourcc code conversion.
|
||||||
|
@ -417,7 +417,7 @@ enum
|
|||||||
|
|
||||||
Simply call it with 4 chars fourcc code like `CV_FOURCC('I', 'Y', 'U', 'V')`
|
Simply call it with 4 chars fourcc code like `CV_FOURCC('I', 'Y', 'U', 'V')`
|
||||||
|
|
||||||
List of codes can be obtained at [Video Codecs by FOURCC](http://www.fourcc.org/codecs.php) page.
|
List of codes can be obtained at [Video Codecs by FOURCC](https://fourcc.org/codecs.php) page.
|
||||||
FFMPEG backend with MP4 container natively uses other values as fourcc code:
|
FFMPEG backend with MP4 container natively uses other values as fourcc code:
|
||||||
see [ObjectType](http://mp4ra.org/#/codecs).
|
see [ObjectType](http://mp4ra.org/#/codecs).
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user