mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 16:35:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,107 Commits 6 Branches 126 Tags 3 GiB
55f02d8c66
Commit Graph

154 Commits

Author SHA1 Message Date
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