Maksim Shabunin
699c25a4be
Merge pull request #7471 from alalek:fix_java_generator
2016-10-13 15:21:39 +00:00
Maksim Shabunin
28b64f6f13
Merge pull request #7457 from alalek:cmake_fix_ios
2016-10-13 14:59:36 +00:00
StevenPuttemans
ca762a6ba7
allow minObjectSize==maxObjectSize for single scale detection capability
2016-10-13 16:05:23 +02:00
abratchik
084c595855
fix for legacy FeatureDetector and DescriptorMatcher classes
2016-10-13 14:45:59 +04:00
Alexander Alekhin
4c8d25878b
cmake: update configuration for iOS
2016-10-12 23:43:29 +03:00
Vadim Pisarevsky
4ed40fd694
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1
2016-10-12 19:54:03 +00:00
Vadim Pisarevsky
4acda3f609
Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection
2016-10-12 19:38:25 +00:00
Alexander Alekhin
c16c803fe9
java: integrate code from base modules
...
To resolve undefined "Mat_to_vector_KeyPoint" error
2016-10-12 18:01:51 +03:00
Alexander Alekhin
994815fbd4
Merge pull request #7413 from tomoaki0705:featureUniversalThreshold
2016-10-12 10:01:37 +00:00
Alexander Alekhin
994c682b77
Merge pull request #7455 from tomoaki0705:featureUniversalLkPyramid
2016-10-12 09:57:53 +00:00
Alexander Alekhin
685a050339
Merge pull request #7431 from ArkadiuszRaj:pgm-16bit
2016-10-12 09:52:04 +00:00
Alexander Alekhin
8e701a948b
Merge pull request #7466 from Trojahn:master
2016-10-12 07:58:37 +00:00
Juha Reunanen
4e7f28811c
Merge pull request #7452 from reunanen:issue-7409-2.4
...
Fix findContours crash for very large images (v2.4)
* Cast step to size_t in order to avoid integer overflow when processing very large images
* Change assert to CV_Assert
2016-10-12 10:37:07 +03:00
Juha Reunanen
0f387cda8f
Merge pull request #7451 from reunanen:issue-7409
...
Fix findContours crash for very large images (#7451 )
* Cast step to size_t in order to avoid integer overflow when processing very large images
* Change assert to CV_Assert
2016-10-12 10:34:51 +03:00
Alexander Alekhin
016359f406
Merge pull request #7442 from catree:morphology_additional_information
2016-10-12 07:31:21 +00:00
Alexander Alekhin
6373e24bd3
Merge pull request #7441 from catree:add_distortion_images
2016-10-12 07:30:52 +00:00
viodetools
114d378cfc
Bugfix #7438
2016-10-11 19:42:50 -03:00
Tomoaki Teshima
1ef740fa2c
use universal intrinsic implementation for calcSharrDeriv
2016-10-11 20:32:33 +09:00
Tomoaki Teshima
ea6410d1e7
use universal intrinsic in threshold
...
* add performance test for 32F and 64F threshold
* requires update of opencv_extra
2016-10-11 18:00:41 +09:00
abratchik
789b35d813
improved fix for java wrapper generator (gen_java.py) to avoid generation of java methods with duplicate signatures(v3)
2016-10-11 02:47:02 +04:00
Alexander Alekhin
73a8fa8e6e
Merge pull request #7447 from alalek:ocl_fix_svm
2016-10-10 20:55:08 +00:00
Alexander Alekhin
f11715b6c3
Merge pull request #7430 from ArkadiuszRaj:aravis
2016-10-10 20:54:14 +00:00
Alexander Alekhin
fe8501c931
ocl: fix SVM code
2016-10-10 20:52:30 +03:00
Alexander Alekhin
218f7574f9
Merge pull request #7440 from mschoeneck:Prefer_OCL_befor_IPP_for_Sobel_and_Scharr
2016-10-10 10:45:27 +00:00
Alexander Alekhin
b0e9346eee
Merge pull request #7416 from StevenPuttemans:add_comment_medianBlur
2016-10-10 10:43:04 +00:00
StevenPuttemans
947f32d2e0
add border replicate note
2016-10-10 09:55:13 +02:00
catree
5e8486f68c
Try to clarify the morphological operations in the tutorial to avoid possible confusions.
2016-10-09 23:45:04 +02:00
ArkadiuszRaj
19bc3f4d17
Chenge arv_camera_abort_acquisition to arv_camera_stop_acquisition
2016-10-09 20:40:00 +02:00
catree
ce7811e5dd
Add distortion example images for calib3d documentation.
2016-10-09 20:35:58 +02:00
ArkadiuszRaj
8bd595acfe
fourcc support, improved buffer handling, check if exposure, gain & fps properties are available
2016-10-09 16:58:30 +02:00
matze
d9f6a06773
Adding check for IPP if UMat and OpenCL is available in Sobel and Scharr.
2016-10-09 15:37:22 +02:00
ArkadiuszRaj
48ae99ecef
Support for MONO8 & MONO12 pixel formats
2016-10-08 13:01:01 +02:00
Alexander Alekhin
714db4cf0d
java: fix Ptr<> code generation
...
Before:
Ptr<Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
After:
Ptr<cv::aruco::Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
2016-10-08 02:19:43 +03:00
Alexander Alekhin
5da8d65371
eliminate compiler warnings
2016-10-08 02:19:43 +03:00
Alexander Alekhin
6cfe4a85f7
cmake: fix ocv_check_compiler_flag
2016-10-08 02:19:43 +03:00
ArkadiuszRaj
d80fd0c85c
Missing declaration
2016-10-07 22:22:46 +02:00
abratchik
be028d0774
fix for #7420 , #7421
2016-10-07 23:58:57 +04:00
ArkadiuszRaj
70c12e5407
Basic support for GigE cameras via Aravis SDK
2016-10-07 21:55:49 +02:00
ArkadiuszRaj
797030aa90
Solution to issue #7408
2016-10-07 21:29:08 +02:00
Graham Fyffe
57be99ff18
Added getLeadingEdges function to subdivision2d
2016-10-06 18:01:34 -07:00
Quentin
9b4cf896fd
Added AKAZE features in the stitcher pipeline (issue #6474 )
2016-10-06 17:47:20 +02:00
Vadim Pisarevsky
dd379ec9fd
Merge pull request #7410 from pylbert:doc_DectectPython
2016-10-06 13:40:33 +00:00
Vadim Pisarevsky
84699e0e18
Merge pull request #7399 from K-Shinotsuka:issue27
2016-10-06 13:31:06 +00:00
Vadim Pisarevsky
294bea11a5
Merge pull request #7401 from K-Shinotsuka:issue28
2016-10-06 13:30:31 +00:00
Vadim Pisarevsky
8ee459207e
Merge pull request #7402 from K-Shinotsuka:issue29
2016-10-06 13:29:56 +00:00
Vadim Pisarevsky
285e6ad15b
Merge pull request #7404 from K-Shinotsuka:issue30
2016-10-06 13:29:00 +00:00
Vadim Pisarevsky
c7c831bca5
Merge pull request #7414 from StevenPuttemans:fix_docs_OPENNI_2.4
2016-10-06 13:26:47 +00:00
Vadim Pisarevsky
018485050f
Merge pull request #7415 from StevenPuttemans:fix_issue_7409
2016-10-06 13:25:28 +00:00
Jcrist99
770c69a978
fix for feature2d java wrappers as described in this post: http://ans … ( #7372 )
...
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* rollback of one change as requested (similar change already merged)
2016-10-06 15:48:26 +03:00
StevenPuttemans
524c61279b
replace principle by principal
2016-10-06 14:09:26 +02:00