Alexander Alekhin
0cbaaba4b1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-12 22:20:50 +00:00
Alexander Alekhin
0c8da03869
Merge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1
2020-06-12 06:58:14 +00:00
Jessica Wong
0417c8c9c7
Added information to OpenCV documentation [MacOS]
...
Added and Edited specific information to the "Installation in MacOS" OpenCV documentation.
Closes #17340
2020-06-11 23:36:06 -04:00
Alexander Alekhin
5f3012fc9a
pre: OpenCV 4.4.0 (version++)
2020-06-09 02:27:13 +00:00
Alexander Alekhin
a43e3bebe6
pre: OpenCV 3.4.11 (version++)
2020-06-08 18:46:27 +00:00
Alexander Alekhin
7722a2b8a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-04 17:58:34 +00:00
Vadim Pisarevsky
5489735258
Merge pull request #17436 from vpisarev:fix_python_io
...
* fixed #17044
1. fixed Python part of the tutorial about using OpenCV XML-YAML-JSON I/O functionality from C++ and Python.
2. added startWriteStruct() and endWriteStruct() methods to FileStorage
3. modifed FileStorage::write() methods to make them work well inside sequences, not only mappings.
* try to fix the doc builder
* added Python regression test for FileStorage I/O API ([TODO] iterating through long sequences can be very slow)
* fixed yaml testing
2020-06-01 11:33:09 +00:00
Alexander Alekhin
73fdf75328
Merge pull request #17338 from hunter-college-ossd-spr-2020:contours-toc
2020-05-29 10:40:43 +00:00
Alexander Alekhin
21e28adb87
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-22 19:50:14 +00:00
Boubacar
0940c56a3f
add note on cmake brew install
2020-05-21 10:34:17 -04:00
Boubacar
b624da27bd
add pylint install note
2020-05-21 07:55:11 -04:00
Boubacar
5b443199ca
group contour articles together
2020-05-21 07:16:54 -04:00
Daniel Mallia
94d187e269
Add next and previous navigation links to all tutorials
2020-05-19 18:59:28 -04: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
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
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
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
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
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
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
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
ihsan314
2c21ea2dd7
Merge pull request #14666 from ihsan314:file_io_xml_yml
...
Python code examples for file IO in xml and yml format
* Initial "Pythonization" of file_input_output.cpp
* Moved file_input_output.py to correct location
* Nearly done Pythonizing file_input_output.cpp
* Python equivalent of file_input_output.py created
* Started Pythonizing camera_calibration.cpp
* Completed Python tutorial/sample code for file_input_output
* Resolved whitespace issues
* Removed tabs in file_input_output.cpp
* Patched import order and wrapped code in main function
* Changed string to docstring format in help file
* Updated link to Python example code
2020-01-12 11:32:12 +03:00
Brian Wignall
f9c514b391
Fix spelling typos
...
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
Brian Wignall
659ffaddb4
Fix spelling typos
2019-12-26 06:45:03 -05:00
Alexander Alekhin
4de1efd3c8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-20 14:02:56 +03:00
Sajarin
ed788229ed
Merge pull request #16165 from sajarindider:macOS_install
...
* doc: added macOS installation guide
* doc: added clarification and corrections
* docs: introduction entry, lowercase file names and ids
2019-12-19 18:15:59 +03:00
