Alexander Alekhin
593af7287b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-18 17:50:16 +00:00
dmallia17
07c56f149f
Merge pull request #17313 from hunter-college-ossd-spr-2020:revise-knn-tutorials
...
* Revise and expand kNN Python tutorials
* Correct NPTEL link
2020-05-18 15:53:17 +00:00
Sauhaarda Chowdhuri
fa349b7a4e
Fix #17279 Documentation Error
...
Update documentation to solve #17279 . Simple documentation bug.
2020-05-13 13:14:05 -07:00
Alexander Alekhin
06bff34a6b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-12 19:24:28 +00:00
Alexander Alekhin
23e336ee53
Merge pull request #17244 from hunter-college-ossd-spr-2020:toc-updates
2020-05-12 07:35:14 +00:00
Rui Hou
e9058ea8f5
Easier access to opencv.js in tutorial
2020-05-10 11:20:27 -04:00
R-penguins
b43da8aa5d
Update Image Watch Tutorial
...
Updated the Windows Visual Studio Image Watch tutorial to include download links to the latest versions of Visual Studio Image Watch for newer Visual Studio versions.
2020-05-09 23:24:47 -04:00
Daniel Mallia
4e789635c9
Update tutorials tables of content for several modules
2020-05-08 14:22:30 -04:00
Alexander Alekhin
73bbabcd04
Merge pull request #17223 from hunter-college-ossd-spr-2020:imgproc-toc
2020-05-07 08:44:02 +00:00
Alexander Alekhin
93d79d2e5d
Merge pull request #17219 from hunter-college-ossd-spr-2020:mathjax-link
2020-05-07 08:43:16 +00:00
Daniel Mallia
c934d9c3cc
Update imgproc tutorials table of content Languages fields
2020-05-06 13:07:24 -04:00
Daniel Mallia
64b0757758
Update Supported formula commands - MathJax link
2020-05-04 23:50:22 -04:00
Daniel Mallia
1622e7cc90
Update NumPy links
2020-05-04 23:20:52 -04:00
Alexander Alekhin
152e6476d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-24 19:02:39 +00:00
Alexander Alekhin
8d05dab32c
Merge pull request #17119 from alalek:move_sift
2020-04-24 18:15:15 +00:00
Alexander Alekhin
a327418767
features2d(sift): move SIFT tests / headers / build fixes
2020-04-23 08:45:22 +00:00
Alexander Alekhin
bfcc136dc7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-21 21:32:51 +00:00
Ganesh Kathiresan
0be2c7018b
Formula Fixes for 3.4 branch
...
Foumula fix 1
Foumula fix 2
Foumula fix 3
Foumula fix 4
Foumula fix 5
Foumula fix 8
2020-04-21 19:23:23 +05:30
Alexander Alekhin
2cef100303
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-16 18:28:27 +00:00
Alanli
7aaa918367
doc: formula miss
2020-04-16 09:05:00 +09:00
Alexander Alekhin
ca9756f6a1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-13 20:00:12 +00:00
Alexander Alekhin
49a75079f2
Merge pull request #17047 from alalek:fix_permissions
2020-04-13 12:34:08 +00:00
Alexander Alekhin
f0ffc52435
fix files permissions
2020-04-13 04:29:55 +00:00
Alexander Alekhin
1537a5f253
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-09 19:19:20 +00:00
Alexander Smorkalov
f496a37340
Migrated FAQ page to Github Wiki
2020-04-08 13:55:44 +03:00
Alexander Alekhin
b8579f12be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-08 10:19:09 +00:00
mehlukas
75bd9f86b2
Merge pull request #16889 from mehlukas:3.4-consolidateImshow
...
* consolidate tutorials on image read/display/write
* fix unsused variables
* apply requested changes
* apply requested changes
* fix mistake
2020-04-07 14:14:51 +00:00
Alexander Alekhin
51a8885566
Merge pull request #16984 from CSharperMantle:argparse-patch-1
2020-04-07 12:54:27 +00:00
Alexander Alekhin
763a1d7392
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-06 15:57:43 +00:00
Alexander Alekhin
c305455cb2
Merge pull request #16967 from benji1123:patch-1
2020-04-06 15:17:23 +00:00
Ben Li
1a6b4d6ce6
typo fix
2020-04-06 14:56:31 +03:00
Bao "Mantle" Rong
3dcb775d16
switch to argparse
2020-04-05 11:57:04 +08:00
albert-github
2d387356de
Incorrect PREDEFINED setting.
...
The PREDEFINED setting for had a space between the define name and the equal sign and this is not allowed, it results in the warning:
```
error: Illegal PREDEFINED format '=', no define name specified
```
according to the documentation explicitly states that no space is allowed:
> The PREDEFINED tag can be used to specify one or more macro names that are defined before the preprocessor is started (similar to the -D option of e.g. gcc). The argument of the tag is a list of macros of the form: name or name=definition (no spaces). If the definition and the "=" are omitted, "=1" is assumed. To prevent a macro definition from being undefined via #undef or recursively expanded use the := operator instead of the = operator.
2020-04-04 16:50:15 +00:00
Alexander Alekhin
0b4c101e8a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-23 16:54:35 +00:00
Alexander Alekhin
2fb1d9d02e
doc: fix misused "see also" doxygen command
2020-03-21 00:25:49 +00:00
Alexander Alekhin
4cdb4652cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-20 21:41:15 +00:00
iteal
e63af185de
Merge pull request #16818 from iteal:master
...
Update template_matching.markdown
Fixed "template image" should be "source image" in two sentences explaining template matching.
2020-03-18 08:45:09 +00:00
Alexander Alekhin
3c85745e22
pre: OpenCV 4.3.0 (version++)
2020-03-10 15:00:03 +03:00
Alexander Alekhin
b7ecaceda8
pre: OpenCV 3.4.10 (version++)
...
- Android Manager version is not increased (stuck on 3.49)
2020-03-10 14:53:43 +03:00
Alexander Alekhin
45d073f889
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-26 20:09:03 +03:00
Gourav Roy
8b5efc6f4c
Merge pull request #16586 from themechanicalcoder:video-psnr
...
* add python version of video-input-psnr-ssim
* remove ret
* documentation changes
* added link for python file
* command line argument
2020-02-22 14:42:26 +03:00
Alexander Alekhin
96b26dc8f4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-20 19:47:27 +03:00
atinfinity
f81fdd58da
Merge pull request #16445 from atinfinity:fixed-typo
...
* fixed typo
* add compatibility code to handle migration
2020-02-16 19:16:33 +03:00
Alexander Alekhin
225566da7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-04 19:49:24 +03:00
ankit6979
17fe63446f
Merge pull request #16499 from ankit6979:3.4
...
* Update py_thresholding.markdown
* 📝 Update py_thresholding.markdown
2020-02-04 15:22:18 +03:00
hannesa2
57c9991413
Merge pull request #16481 from hannesa2:DeleteOldAndroidManifest.xml
...
* delete old AndroidManifrst.xml
* fix tutorial generation
2020-02-03 16:34:03 +03:00
Alexander Alekhin
bf2f7b0f8b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-01 17:26:00 +00:00
Gourav Roy
126b0d855f
Merge pull request #16366 from themechanicalcoder:features2D-tutorial-python
...
* Add python version of panorama_stitching_rotating_camera and perspective_correction
* Updated code
* added in the docs
* added python code in the docs
* docs change
* Add java tutorial as well
* Add toggle in documentation
* Added the link for Java code
* format code
* Refactored code
2020-02-01 20:20:00 +03:00
Alexander Alekhin
fb61f88b9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-12 09:35:39 +00:00
Gourav Roy
38e6d668b1
Merge pull request #16276 from themechanicalcoder:video-tutorial
...
* Added java code for meanshift and optical_flow
* added java code for module video
* added appropriate spaces in codes
* converted absolute path to command line arguments
* added spaces at appropriate places
2020-01-12 11:34:59 +03:00