mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-16 18:39:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,080 Commits 6 Branches 127 Tags 3 GiB
fc810434de
Commit Graph

264 Commits

Author SHA1 Message Date
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
Fady Essam
1b294c013a remove unnecessary imports in knn tutorials 2019-05-09 00:01:57 +02:00
Alexander Alekhin
d0032b0717 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-22 18:17:28 +00:00
Manthan Keim
269c28e69e Update py_svm_opencv.markdown 
Fixes a broken link for histograms of Oriented Gradients.
 2019-04-20 18:52:13 +00:00
Alexander Alekhin
4635356435 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-13 20:00:54 +00:00
Nick Yang
169dc9c311 Merge pull request #14297 from shxuy:patch-1 
fix just a typo of the word 'word' (#14297)
 2019-04-12 19:32:08 +03:00
Alexander Alekhin
c9fc27b337 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-05 19:08:23 +00:00
Alexander Alekhin
473941c341 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-04 18:09:24 +00:00
Alexander Alekhin
d38869eb76 docs: fix links 
- replace tutorial links via docs.opencv.org
- remove link on OpenCV 2.4
- avoid links on outdated packages
 2019-04-04 18:57:22 +03:00
mehlukas
ab21dc6d47 Merge pull request #14245 from mehlukas:3.4-fixtutorial 
* improve thresholding tutorial, fix grammar issues and incorrections

* keep full list of simple thresholding types
 2019-04-04 17:44:03 +03:00
Alexander Alekhin
c3cf35ab63 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-02-26 17:34:42 +03:00
LaurentBerger
4ebb617000 Check return value in python tutorial 2019-02-21 11:02:12 +01:00
klemens
5d9c6723ee spelling fixes 
backport 997b7b18af
 2019-02-11 15:35:10 +03:00
klemens
997b7b18af spelling fixes 2019-02-09 22:29:54 +01:00
Alexander Alekhin
631b246881 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-01-22 18:00:34 +00:00
atinfinity
e48682a9f7 Merge pull request #13616 from atinfinity:fixed-py_matcher-tutorial 
* fixed tutorial code of py_matcher

* fixed imread mode
 2019-01-13 12:34:05 +03:00
Alexander Alekhin
e82e672a93 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-06 07:06:58 +00:00
Alexander Alekhin
742f22c09b photo: move TonemapDurand to opencv_contrib 2018-12-04 18:59:27 +03:00
Alexander Alekhin
8409aa9eba Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-14 19:41:09 +00:00
ssnover95
b24a815ac1 doc(tutorial_py_fourier_transform): Correct errors in tutorial for integer division and filter symmetry 2018-11-13 12:45:23 -05:00
Pavel Rojtberg
0d65397ae7 videoio: remove cap_libv4l in favour of cap_v4l 
cap_libv4l depends on an external library (libv4l) yet is still larger
(1966 loc vs 1822 loc).
It was initially introduced copy pasting cap_v4l in order to offload
various color conversions to libv4l.
However nowadays we handle most of the needed color conversions inside
OpenCV. Our own implementation is better tested and (probably) also
better performing. (as it can optionally leverage IPP/ OpenCL)

Currently cap_v4l is better maintained and generally the code is in
better shape. There is however an API
difference in getting unconverted frames:
* on cap_libv4l one need to set `CV_CAP_MODE_GRAY=1` or
`CV_CAP_MODE_YUYV=1`
* on cap_v4l one needs to set `CV_CAP_PROP_CONVERT_RGB=0`

the latter is more flexible though as it also allows accessing undecoded
JPEG images.

fixes #4563
 2018-11-12 13:38:59 +03:00
Alexander Alekhin
1913482cf5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-10 20:50:26 +00:00
Alexander Alekhin
cdaca22511 Merge pull request #12891 from marcoag:master 2018-11-07 19:21:43 +00:00
Marco A. Gutierrez
6b3469268e minor typo corrections to python tutorials 2018-11-07 16:18:52 +08:00
Alexander Alekhin
50bec53afc Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-26 17:56:55 +03:00
Ali Yasin Eser
28a14df26c Update depth map for pytho-opencv 2018-10-24 19:29:27 +02:00
Suleyman TURKMEN
8eb987e393 Update findContours parameter type 2018-09-28 18:42:48 +03:00
Alexander Alekhin
e6171d17f8 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-18 12:49:52 +03:00
gkaneto
96a50d5eb0 Update py_basic_ops.markdown 
Correcting indentation of border type flags
 2018-09-15 19:35:40 +00:00
gkaneto
79db32bcd9 Update py_trackbar.markdown 
For some mysterious (for me) reason, two lines of the code appears in my browser (Chrome) in the same line.
I've add an "enter" (just pressed enter), but don't know if it's the best solution.
 2018-09-15 19:35:40 +00:00
Hamdi Sahloul
64380baa85 Documentation for the new bindings-generator features 2018-08-25 01:58:42 +09:00
Alexander Alekhin
4eb2966559 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-07 20:12:10 +03:00
luz.paz
2003eb1b9b Misc. typos 
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
 2018-07-31 18:44:23 +03:00
Alexander Alekhin
64f2b1b250 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-06-17 16:26:48 +03:00
vishwesh5
018eab7040 Corrected formula 
Corrected formula for weighted within-class variance
 2018-06-14 12:30:06 +05:30
Alexander Alekhin
0d6518aaa0 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
 2018-06-13 19:34:44 +03:00
Kyle D. Patterson
f581992a62 Update py_calibration.markdown 
Improved readability by correcting grammar and idioms.

Further improved language and readability.

Attempted to fix list bullets.

Again, attempted to fix list bullets.

Removed trailing whitespace on line 8.
 2018-06-06 16:26:11 -04:00
catree
afa5b0cc93 Add Java and Python code for cascade classifier and HDR tutorials. 2018-06-08 19:30:30 +02:00
Alexander Alekhin
9ba9358ecb documentation: avoid links to 'master' branch from 3.4 maintenance branch 2018-05-31 16:45:18 +03:00
matech96
e98da758cc
Update py_meanshift.markdown 
Fix publication date of "Computer Vision Face Tracking for Use in a Perceptual User Interface" from 1988 to 1998.
 2018-05-10 22:07:50 +02:00
Vadim Pisarevsky
29869c5b91 Merge pull request #11243 from alalek:with_cuda_default_off 2018-04-09 09:46:34 +00:00
y0umu
ade29fc6c9 Merge pull request #11260 from y0umu:patch-1 
Correct a mistake in {js,py}_table_of_contents_histograms.markdown (#11260)

* Update py_table_of_contents_histograms.markdown

"Learn to find and draw Contours" => "Learn the basics of histograms"

* Update js_table_of_contents_histograms.markdown

Corrected a seemlingly wronged line of copy in the python documention js_table_of_contents_histograms.markdown

"Learn to find and draw Contours" => "Learn the basics of histograms"
 2018-04-07 19:39:37 +03:00
Alexander Alekhin
4990506948 cuda: WITH_CUDA=OFF by default (need to enable it explicitly) 2018-04-05 19:23:58 +00:00
Naoto Mizuno
ddf6bc86a7 Update rotated image 2018-03-22 22:09:19 +09:00
Naoto Mizuno
e1b66ffd01 Fix center of rotation 2018-03-22 19:38:39 +09:00
Jonathan Martens
1949412979
Update URL to Timing and Profiling in IPython 
Apparently the blog has been updated and the URL has changed, it is still there though.
 2018-03-16 19:37:08 +01:00
luz.paz
d47b1f3b70 Misc. ./apps ./doc ./platoforms typos 
Found via `codespell -q 3 --skip="./3rdparty" -I ../opencv-whitelist.txt`
 2018-02-08 13:04:34 -05:00
LaurentBerger
6e5da9dbe3 bad image file 2018-01-24 09:09:49 +01:00
wxzs5
0a4b1b8d68 Use class' method to set attribute value 2017-12-27 11:57:58 +08:00
wxzs5
25c17b107e Fix functions‘ class attribution error 2017-12-27 11:57:17 +08:00
wxzs5
b19cd93738 Remove redundant return variable 2017-12-22 17:13:57 +08:00
Alexander Alekhin
5560db73bf python: 'cv2.' -> 'cv.' via 'import cv2 as cv' 2017-12-11 13:46:55 +03:00
Akhilesh Kumar
fcdd833059 Merge pull request #10056 from akhilesh-k:master 
Added Python setup docs for Ubuntu Machines (#10056)
 2017-11-14 13:44:01 +03:00
Vadim Pisarevsky
712689e81a Merge pull request #9865 from ryanfox:patch-4 2017-10-30 09:54:48 +00:00
Ryan Fox
db0a159229 copyediting on python object detection tutorial 
clarify some passages, fix grammar errors
 2017-10-24 21:17:39 -05:00
Ryan Fox
3da9598add fix and clarify several grammar issues 2017-10-16 19:07:17 -05:00
Ryan Fox
0246cffc34 Fix up grammatical errors in python tutorial 2017-10-15 22:59:48 -05:00
Ryan Fox
a96c5b5d90 fix some grammatical errors 2017-10-10 21:37:26 -05:00
Bisaloo
ed397cfbea Fix 404 url in canny edge detection tutorial 2017-10-04 11:16:06 +02:00
Alexander Alekhin
ca9a3af704 Merge pull request #9756 from pranitbauva1997:doc-typo-faster 
doc: fix typo in py_tutorials
 2017-10-02 14:26:07 +03:00
Pranit Bauva
d3e3d0996c doc: fix typo in py_tutorials 2017-10-02 15:54:00 +05:30
Vivek Wisdom
e6ee800fde Corrected Typo in Additional Resources Section 
Corrected the Typo 'Hasing' to 'Hashing' in second item in Additional Resources section. Also added Wikipedia link for the LSH.
 2017-08-31 17:37:24 +05:30
Alexander Alekhin
cfe849bd43 Merge pull request #9246 from bragboy:patch-1 2017-08-02 20:22:11 +00:00
puqeko
9deb206e74 Add tested codecs for OSX 2017-07-29 11:56:02 +12:00
Bragadeesh
d61f5d160d A simple spelling change. 2017-07-27 17:08:45 +05:30
Maksim Shabunin
2a33f452b0 Fixed minor doc issue 2017-07-03 12:56:22 +03:00
lewisjb
47c9bb7ba8 Update doc build instructions for doxygen 2017-06-11 00:00:45 +10:00
Alexander Alekhin
35de1c9fdf Merge pull request #8809 from berak:fix_py_tut_braces_py3 2017-05-29 13:16:08 +00:00
berak
0f51155e79 py_tutorials: add print() braces for python3 2017-05-29 13:19:20 +02:00
Yuval Langer
4ac5f37d49 Add inline code backticks 2017-05-24 12:44:52 +03:00
berak
2af63c2bf1 fix py_svm_opencv sample 2017-05-21 07:39:05 +02:00
vskarlsruhe
ef033be59d Update py_setup_in_windows.markdown 
updated links for python, numpy and matplotlib
 2017-04-03 11:58:22 +02:00
Sixela David
75a489b75b Correcting issue #8431 2017-03-27 11:15:03 +02:00
Kene Udeh
873b2cabb8 Merge pull request #8378 from kudeh:master 
Fix grammar error in py_features_meaning.markdown (#8378)
 2017-03-14 13:21:28 +00:00
Vadim Pisarevsky
da0188acc0 Merge pull request #8245 from oulenz:patch-1 2017-03-10 14:30:09 +00:00
xuning0
8c93b61e2c Fix the description of ROI 2017-03-05 22:47:49 +08:00
oulenz
28cfb07445 FLANN_INDEX_KDTREE = 0 -> 1 
0 corresponds to FLANN_INDEX_LINEAR
 2017-02-22 19:13:34 +01:00
oulenz
9cb13435a1 FLANN_INDEX_KDTREE = 0 -> 1 
0 corresponds to FLANN_INDEX_LINEAR
 2017-02-22 19:10:33 +01:00
oulenz
29eda007bb Fix FLANN_INDEX_KDTREE, add FLANN_INDEX_LSH initialisation 
Add initialisations to make clear what values actually have to be passed.

Moreover, in accordance with 383559c228/modules/flann/include/opencv2/flann/defines.h (L68), I believe `FLANN_INDEX_KDTREE` was being initialised wrongly in the code examples, 1 should be correct, whereas 0 is `FLANN_INDEX_LINEAR`.
 2017-02-22 17:45:21 +01:00
cclauss
a347569350 Merge pull request #8150 from cclauss/patch-1 
cv2.findContours() no longer modifies source image (#8150)

* cv2.findContours() no longer modifies source image

Since OpenCV 3.2, cv2.findContours() no longer modifies the source image but returns a modified image as the first of three return parameters.  ??? Do I have that correct ???

Also fixed up the code blocks to be valid markdown.

* ```python --> @code{.py}

Enables syntax highlighting in docs.
 2017-02-10 15:12:11 +03:00
chrizandr
88f5e2f3f7 Corrected typo in py_histogram_begins tutorial 2017-02-06 16:05:48 +05:30
Alexander Alekhin
8f96b15e2a Merge pull request #8024 from catree:fix_typo_py_houghlines 
Fix typos in py_houghlines tutorial.
 2017-01-18 19:56:25 +03:00
Maksim Shabunin
66cdc10010 Minor documentation fixes: 
- disabled OPTIMIZE_OUTPUT_JAVA
- filtered out *.m scripts
- removed link to old Sphinx documentation
- replaced all mentions of Sphinx with Doxygen
 2017-01-18 13:32:20 +03:00
catree
e357e2c1b7 Fix typos in py_houghlines tutorial. Extract the python code in a specific folder. 2017-01-17 16:09:27 +01:00
StevenPuttemans
5728f796f6 updating python tutorials + providing necessary data 2016-10-26 13:14:20 +02:00
berak
c2513ffb5f python tutorials: removed remainders of former Algorithm interface 2016-09-30 12:53:09 +02:00
Maksim Shabunin
d1d8c7d8a6 Merge pull request #7056 from ludv1x:python-extra-bindings 2016-08-16 13:00:31 +00:00
Vitaliy Lyudvichenko
ab8de8f506 Adding of user-defined type conversions for python bindings inside module directories 
Adding of destructor and placement new constructors for classes wrapped with CV_EXPORTS_W_SIMPLE macro
 2016-08-16 13:10:17 +03:00
Vadim Pisarevsky
c1d73e4fca Merge pull request #7059 from berak:doc_python_drawkeypoints 2016-08-08 15:31:11 +00:00
berak
d2a1994d71 python docs: fix missing output image in cv2.drawKeypoint examples 2016-08-08 08:14:26 +02:00
Oskari Vinko
31fb82176d Corrected tutorial grammar and sentences 2016-07-25 20:25:38 +02:00
Vadim Pisarevsky
705e776f09 Merge pull request #6816 from phunsukwangdu:devbranch1 2016-07-19 15:50:11 +00:00
Alexander Alekhin
ddc0b42bc3 migration: github.com/opencv/opencv 2016-07-12 12:51:12 +03:00
berak
e233f7d199 py_tutorials: fix cv2.findContours return val 2016-07-10 11:17:00 +02:00
Ankit Yadav
c62eda023d Fix typo 2016-06-11 17:56:58 +05:30
Susmit
d913463932 Terrible bugs in the tutorial code in py_pose.markdown 
There were two bugs that were solved here.Changes were done after extreme testing.
1.replaced cv2.solvePnPRansac() with cv2.solvePnP() previous fc was giving terrible errors.
2.The code was incapable of saving edited pics;Now fixed with little code mods.
 2016-06-02 17:47:45 +05:30
Susmit
98dce911ca Update py_calibration.markdown 
In the camera calibration code { cv2.cornerSubPix() } will be of no use.In the updated code it is assigned to the (corners2) variable 
which is passed down to { cv2.drawChessboardCorners() }
 2016-06-02 01:06:17 +05:30
Hannes
66549414dd fixed "tot_error" to "mean_error" & nicer whitespace 2016-05-17 20:00:28 +02:00
Hannes
3b2a194c30 fixed "corners2" to "corners" & nicer whitespace 2016-05-17 19:36:32 +02:00
berak
fa1426f123 fix python ml tutorials 2016-02-29 22:37:59 +01:00
Ishank gulati
fb63cbb74b path to videocapture-get changed 2015-12-21 19:30:37 +05:30
Alexander Alekhin
323e24e3ef change links from samples/python2 to samples/python 2015-12-18 11:00:30 +03:00
Elad Joseph
a87ae5910f fixed whitespace 2015-12-07 22:06:08 +02:00
Elad Joseph
eaa573f56a fixed whitespace 2015-12-07 21:39:01 +02:00
Elad Joseph
421c922539 Add HDR tutorial to the python tutorials 
Add py_hdr tutorial under py_tutorials\py_photo.
This tutorial is similar to the one which is given at the C++ tutorials.
 2015-12-07 20:57:10 +02:00
berak
781931a671 update python features2d tutorials 2015-10-21 08:22:22 +02:00
StevenPuttemans
913c266b4a adding missing images from python tutorials, like chessboard.png, simple.jpg, home.jpg, fly.png, ... 2015-10-08 11:59:54 +02:00
Adam
37d300f250 Correction of minor typo. 2015-09-14 00:12:06 +08:00
Valentin Tsatskin
a28a556f60 Fix variable names in python color spaces tutorial 2015-09-03 15:45:36 -04:00
Vipul Sharma
072b1469e7 fixed the URL under Additional Resources 
The URL http://www.nptel.iitm.ac.in/courses/106108057/26 under Additional Resource section gives a 404. I've added the updated one i.e. http://www.nptel.ac.in/courses/106108057/26
 2015-08-27 15:37:04 +05:30
Steven Puttemans
be89b0505a Fix 2015-08-19 13:46:17 +02:00
StevenPuttemans
b09f591dda fix py_matcher tutorial 2015-08-07 09:36:49 +02:00
Maksim Shabunin
6d1cbc6458 Reorganized user guide 2015-05-13 18:46:21 +03:00
Maksim Shabunin
3f91b0d340 Fixed external link in python colorspace tutorial 2015-05-13 18:46:21 +03:00
Maksim Shabunin
c8cb03fd8f Replaced 'corrected' to 'distorted' in camera calibration tutorials 2015-05-13 18:46:21 +03:00
StevenPuttemans
34dacdea32 fixing all RGB instances to BGR where needed 2015-05-04 09:02:46 +02:00
berak
723c317108 changed create function in tutorial 2015-04-14 19:01:48 +02:00
sanuj
1f53b65511 Fix documentation in python binding tutorial 2015-03-05 20:00:19 +05:30
Vadim Pisarevsky
c9ea878d10 Merge pull request #3722 from berak:py_houghlines_sample 2015-03-03 18:16:25 +00:00
StevenPuttemans
370389c7af add extra output argument to tutorial 2015-02-23 15:13:33 +01:00
berak
c83044d45a fix houghlines.py sample and tutorial 
fix whitespace
 2015-02-20 10:51:52 +01:00
Nisarg Thakkar
437ef99ba5 Fixed doc error in optical flow 2015-02-17 22:14:57 +05:30
Maksim Shabunin
ad6a80f68c Moved tutorial table-of-contents files to corresponding root level 2014-12-26 19:17:14 +03:00
Maksim Shabunin
d01bedbc61 Removed Sphinx documentation files 2014-12-26 19:12:19 +03:00
Vadim Pisarevsky
25378587e2 Merge pull request #3479 from mshabunin:doxygen-tutorials 2014-12-09 14:06:23 +00:00
Maksim Shabunin
ecfd056111 Fixed whitespace warnings in new tutorials 2014-12-05 15:33:53 +03:00
fhsm
146d66267f White space and spelling in meanshift tutorial 
Removed a leading whitespace from a parenthetical comment and corrected the spelling of "maybe"
 2014-12-02 12:46:05 -05:00
Maksim Shabunin
d3beb755df Doxygen tutorials: support contrib, some minor changes 2014-12-01 19:22:04 +03:00
Maksim Shabunin
812ce48c36 Doxygen tutorials: python final edits 2014-12-01 16:05:38 +03:00
Maksim Shabunin
875f922332 Doxygen tutorials: python basic 2014-12-01 16:05:38 +03:00
burun
c52a3f7634 Update py_colorspaces.rst 
mask = cv2.inRange(hsv, lower_green, upper_green)
to
mask = cv2.inRange(hsv, lower_blue, upper_blue)
 2014-11-27 09:00:40 +02:00
eltermann
b3a60b9c22 Documentation fix on py_tutorials/py_feature2d 2014-11-11 17:10:33 -02:00
eltermann
c87af333b3 Documentation fix on py_tutorials 2014-10-04 19:14:11 -03:00
Vadim Pisarevsky
8fe18fefdd Merge pull request #3207 from jamoque:more-better-fixes 2014-09-14 18:41:06 +00:00
Maksim Shabunin
88aea1d52f Stripped iCCP chunk from png files 2014-09-12 16:30:23 +04:00
jeremy
56091bae1f changing many instances of the same grammar error in documentation 2014-09-09 17:03:59 -05:00
Alexander Shishkov
9dc5c58f62 Update py_setup_in_windows.rst 2014-08-27 11:49:37 +04:00
abidrahmank
7f8e1f480a Python bindings tutorial 2014-08-16 16:40:18 +05:30
vbystricky
4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
PhilLab
3ece65ad62 Updates python feature matching tutorial 
The given ORB parameter was misspelled
 2014-06-24 11:35:22 +02:00
Kenaniah Cerny
5005f5e88e Fixed type gPython -> Python 2014-03-26 23:15:42 -07:00
Kenaniah Cerny
c764e0f114 Added link to main GitHub repo 2014-03-26 23:12:43 -07:00
Kenaniah Cerny
9f1b20a794 Grammar 2014-03-26 23:11:03 -07:00
Roman Donchenko
3572ee278e Merge pull request #2396 from m3d:patch-1 2014-03-21 14:00:12 +04:00
Roman Donchenko
722c0fea41 Merge pull request #2414 from yashdv:meanshift_tutorial_error 2014-03-21 13:55:35 +04:00
yash
b9cdde6991 edited sample code for mean/cam sihft and fixed an error 2014-03-18 08:44:33 +05:30
Martin Dlouhy
8f6ebc2427 fixed rotated rectangle (center instead of corner) 2014-02-24 07:54:08 +01:00
Roman Donchenko
cfc4621587 Merge pull request #2291 from xgvargas:extra-note-for-waitKey 2014-02-19 14:33:58 +04:00
Gustavo Vargas
0d199b4048 Update py_image_display.rst 2014-02-17 23:22:18 -03:00
Roman Donchenko
f297ec55ae Merge pull request #2304 from mattvenn:master 2014-02-13 12:30:20 +04:00