potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-07 19:02:55 +03:00
parent f3de2b4be7 254f88f805
commit ddcf388270
43 changed files with 446 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/misc/java/gen_dict.json
-3
View File
@@ -1,7 +1,4 @@
{
"class_ignore_list" : [
"SimpleBlobDetector"
],
"type_dict" : {
"Feature2D": {
"j_type": "Feature2D",