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
3c5fec6746
build: updates for winpack dldt
2020-03-31 22:18:21 +00:00
Alexander Alekhin
e12b1c2209
build: updates for winpack dldt
2020-03-31 20:29:11 +00: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
Muhammad Taha
8177adbd54
Minor update in grabcut.py
2020-02-20 16:19:24 +03:00
Aditya Kumar
e007d93d93
Merge pull request #14107 from adityak2920:aditya
...
Adding python codes to samples/python
* Python version of samples:
- laplace.py
- drawing.py
* Update drawing.py
* Update drawing.py
* Update drawing.py
* Update laplace.py
* Update laplace.py
* Update drawing.py
* Update drawing.py
* Update laplace.py
* samples
* drawing
* drawing
* drawing.py
2020-02-20 15:41:55 +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
560f85f8e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-28 14:26:57 +03:00
Alexander Alekhin
043b9fbb31
Merge pull request #16170 from themechanicalcoder:tutorial_1
2020-01-24 21:26:18 +00:00
Gourav Roy
a6359e49d2
Added tutorial for text skewness correction in C++ and Python.
2020-01-23 08:24:39 +03:00
Alexander Alekhin
2b9cfe1e1c
Merge pull request #16257 from ianare:more-pythonic
2020-01-16 13:57:08 +00:00
Alexander Alekhin
4cb9faf6c9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-14 17:04:22 +03:00
Alexander Alekhin
4cc458eb10
Merge pull request #16335 from berak:fix_ml_python_digits_samples_3.4
2020-01-13 12:16:40 +00:00
berak
a718f2e6ea
ml/python: fix digits samples(3.4)
2020-01-13 12:26:28 +01:00
Alexander Alekhin
fb61f88b9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-12 09:35:39 +00: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
Ianaré Sévi
e4a64760db
make stitching script more pythonic
2020-01-04 00:41:03 +01:00
Alexander Alekhin
1996ae4a42
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-31 10:11:39 +00:00
Jed
ef290366b0
Removed deprecated 'clock' import.
2019-12-30 13:00:29 +00: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
48073e6d95
pylint: eliminate warnings
2019-11-01 18:59:35 +03:00
Alexander Alekhin
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
Alexander Alekhin
0e40c8a031
fix pylint warnings
...
pylint 1.8.3
2019-10-16 18:49:33 +03:00
Alexander Alekhin
a052567db8
Merge pull request #15530 from sturkmen72:update_samples_v4
2019-09-20 16:41:41 +00:00
Suleyman TURKMEN
2d2330382d
Update samples
2019-09-20 18:03:26 +03:00
Alexander Alekhin
a7b954f655
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-23 19:24:37 +03:00
craterkamath
04f720d56a
Fixed Typo Closes #15148
2019-08-19 22:52:00 +05:30
luz.paz
57ccf14952
FIx misc. source and comment typos
...
Found via `codespell -q 3 -S ./3rdparty,./modules -L amin,ang,atleast,dof,endwhile,hist,uint`
backporting of commit: 32aba5e64b
2019-08-15 13:09:52 +03:00
luz.paz
32aba5e64b
FIx misc. source and comment typos
...
Found via `codespell -q 3 -S ./3rdparty,./modules -L amin,ang,atleast,dof,endwhile,hist,uint`
2019-08-14 13:33:49 -04:00
Alexander Alekhin
097d81363b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-02 21:17:45 +00:00
tribta
e8283f94ed
Fix Python code, for the tutorial_laplace_operator, to get the same result between the Cpp, Java and Python
2019-06-23 18:03:01 +01:00
Alexander Alekhin
ddcf388270
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-07 19:02:55 +03:00
SchultzC
1e6e18ff05
Changed to integer division
2019-06-06 14:50:45 -07:00
SchultzC
3833d86f0f
Merge pull request #14733 from SchultzC:3.4
...
* cast positional arguments to int
* Changed to integer division based
* removed white space
* removed white space
2019-06-06 13:02:45 +03:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
SchultzC
edb3337ead
Remove divide by 1000
...
because t = (time.time() - t) will return seconds, dividing by 1000 to obtain seconds will be incorrect.
2019-06-04 08:17:37 -07:00
Alexander Alekhin
e21262deba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-16 04:40:39 +00:00
mehlukas
6bff0e24f8
Merge pull request #14314 from mehlukas:3.4-opticalflow
...
Extend optical flow tutorial (#14314 )
* extend python optical flow tutorial with cpp example code and add it to general tutorial directory
* remove unused parameters, fix comparison between signed and unsigned int
* fix hsv range problem
* switch to samples::findFile for sample file location
* switch to command line parameter for path
* remove old tutorial as in 14393
* minor fixes
2019-05-15 15:13:57 +03:00
mehlukas
47c45e5bd3
Merge pull request #14393 from mehlukas:3.4-meanshift
...
Extend meanshift tutorial (#14393 )
* copy original tutorial and python code
* add cpp code, fix python code
* add camshift cpp code, fix bug in meanshift code
* add description to ToC page
* fix shadowing previous local declaration
* fix grammar: with -> within
* docs: remove content of old py_meanshift tutorial, add link
* docs: replace meanshift tutorial subpage in Python tutorials
* switch to ref to fix wrong breadcrumb navigation
* switch to cmdline for path as in #14314
* Apply suggestions from code review
* order programming languages alphabetically
2019-05-15 13:34:20 +03:00
Alexander Alekhin
8c25a8eb7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-22 19:31:31 +03:00
Pedro Ferreira da Costa
9cef78b685
Merge pull request #14109 from PedroFerreiradaCosta:adding_python_version_to_anisotropic_tutorial
...
* Created python version of the code for the anisotropic image segmentation tutorial. Created python/cpp toggles for the markdown file.
* fix doxygen warnings
2019-03-21 22:53:12 +03:00
Alexander Alekhin
fbed33cc1f
samples: fix python samples compatibility with demo.py
2019-03-21 19:42:34 +00:00
Alexander Alekhin
04fad57fc1
samples: fix python samples compatibility with demo.py
2019-03-20 18:32:34 +03:00
LaurentBerger
d338644159
Issue 14047
2019-03-13 22:28:02 +01:00
LaurentBerger
49a43dfc8f
Check syntax of stitchnig detailed
2019-01-18 19:31:05 +01:00
