mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 20:50:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,607 Commits 6 Branches 126 Tags 3 GiB
55534eeb06
Commit Graph

255 Commits

Author SHA1 Message Date
Alexander Panov
b4b35cff15
Merge pull request #22368 from AleksandrPanov:move_contrib_aruco_to_main_objdetect 
Megre together with https://github.com/opencv/opencv_contrib/pull/3325

1. Move aruco_detector, aruco_board, aruco_dictionary, aruco_utils to objdetect
1.1 add virtual Board::draw(), virtual ~Board()
1.2 move `testCharucoCornersCollinear` to Board classes (and rename to `checkCharucoCornersCollinear`)
1.3 add wrappers to keep the old api working
3. Reduce inludes
4. Fix java tests (add objdetect import)
5. Refactoring

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake

```
**WIP**
force_builders=linux,win64,docs,Linux x64 Debug,Custom
Xbuild_contrib:Docs=OFF

build_image:Custom=ubuntu:22.04
build_worker:Custom=linux-1
```
 2022-12-16 12:28:47 +03:00
Alexander Alekhin
b16f76eede Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2022-12-03 12:39:41 +00:00
ClayXrex
71a1150c95 fix: typo 2022-11-30 12:52:51 +03:00
Zhuo Zhang
c63a6c472d fix typo: Gausssian to Gaussian 2022-11-21 10:44:12 +08:00
Alexander Alekhin
762481411d Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2022-10-15 16:44:47 +00:00
Kian Eliasi
99683e958a
Fix the example in py_calib3d/py_calibration 2022-08-12 19:26:59 +04:30
OpenCV Developers
d9a444ca1a Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2022-05-14 11:23:21 +00:00
Yulv-git
1cdd8510fd Fix some typos in doc. 2022-04-30 13:29:25 +08:00
Alexander Alekhin
c78a8dfd2d fix 4.x links 2021-12-22 13:24:30 +00:00
Alexander Alekhin
d24befa0bc Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-12-11 15:18:57 +00:00
UncleLLD
5aef565fb6
Merge pull request #21188 from UncleLLD:fix-markdown-error 
fix issue 21187: markdown file: gray image does not have three dimensions
 2021-12-06 16:14:17 +00:00
Alexander Alekhin
31c40fa4cc Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-10-15 13:35:03 +00:00
icestraw
e4a87f2f4f fix type error of slice indices 2021-10-14 11:52:35 +08:00
Alexander Alekhin
0c10ae1861 python: cv.Mat wrapper over numpy.ndarray 2021-09-21 04:14:15 +00:00
Alexander Alekhin
c3ac834526 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-09-11 21:27:26 +00:00
Zhuo Zhang
36cc43170d
docs: fix image path for py_fast doc 2021-09-06 13:05:58 +08:00
Alexander Alekhin
424eaba4c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-08-07 17:25:06 +00:00
AleksandrPanov
65134c793b add links in python and js contours tutorial 2021-08-05 14:21:34 +03:00
Mahendra Kumar
b468468e7e Closing brackets missing 
In line 94,  closing brackets are added which were missing .
 2021-08-01 08:41:03 +00:00
Alexander Alekhin
f4d6a3ec4e Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-07-24 15:34:58 +00:00
Shreyas Taware
803ff8ebb9 Update py_canny.markdown 
Fixed a word that was previously written as third argument but it is instead the fourth argument of cv.Canny() function
 2021-07-23 05:01:20 +00:00
Alexander Alekhin
cb51a155b2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-05-29 19:00:14 +00:00
hyrodium
81567a9d3e fix latex script in the docs 2021-05-26 12:46:14 +09:00
Alexander Alekhin
0a6f216f83 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-02-21 20:14:09 +00:00
Larry Wei
98c2ccfaa3
Merge pull request #19586 from larryw3i:patch-2 
* Update py_setup_in_ubuntu.markdown
 2021-02-21 19:22:43 +00:00
Alexander Alekhin
cd59516433 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-01-22 21:29:21 +00:00
Maksim Shabunin
e4e10e54df Updated more links to forum.opencv.org 2021-01-19 22:03:22 +03:00
Maksim Shabunin
f65d75f5c8 Updated more links to forum.opencv.org 2021-01-19 21:55:45 +03:00
kyshel
321f26f450 update xrange() to range() 
update xrange() to range() as Python 2 has been deprecate, more info:
1.  Python 2 has been no longer supported officially since January 1, 2020.  Check  https://www.python.org/doc/sunset-python-2/
2.  xrange() was renamed to range() in Python 3. Check  https://stackoverflow.com/questions/17192158/nameerror-global-name-xrange-is-not-defined-in-python-3/17192181#17192181

update xrange() to range()

Update py_fourier_transform.markdown

update xrange() to range()
 2021-01-18 19:52:37 +08:00
Alexander Alekhin
d3bc563c6e Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2021-01-12 18:34:33 +00:00
notmatthancock
2d2d72afbb
Merge pull request #19258 from notmatthancock:doc/update-sift-patent-blurb 
* Remove sentences about SIFT patent and code location

* Add note about patent in opencv-specific section
 2021-01-05 11:33:57 +00:00
Alexander Alekhin
2155296a13 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-11-27 14:08:06 +00:00
Gabriel Nascarella Hishida
f28895cd6b doc: Fix example code using deprecated xrange 
xrange was abandoned and doesn't exist in Python 3. range() works just the same
 2020-11-25 09:34:38 -03:00
Alexander Alekhin
0105f8fa38 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-11-20 20:32:00 +00:00
Ian Maquignaz
fef23768fe Fixed issue with Epipolar Geometry Tutorial 2020-11-18 12:34:27 -05:00
Alexander Alekhin
ef32d7fd16 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-11-10 20:09:18 +00:00
junxnone
ad71a1633c fix truncate threshold example display issue in py_tutorials 
Signed-off-by: junxnone <junchen0102@gmail.com>
 2020-11-06 16:38:03 +08:00
Alexander Alekhin
f52a2cf5e1 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-09-19 17:03:08 +00:00
or-toledano
49ba744130
Fix np row,column to cv y,x 
This explanation was created to avoid confusion, but it seems like the author was confused :D
 2020-09-14 14:23:38 +03:00
Alexander Alekhin
fa25faa2d2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-08-06 14:15:52 +00:00
Anna Petrovicheva
f86c8656a3 Updated the OpenCV logo 2020-07-28 18:31:21 +03:00
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
Alexander Alekhin
06bff34a6b Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-05-12 19:24:28 +00: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
a327418767 features2d(sift): move SIFT tests / headers / build fixes 2020-04-23 08:45:22 +00:00
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
b8579f12be Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-04-08 10:19:09 +00:00