Alexander Alekhin
7793299e53
Merge pull request #7507 from vrabaud:iplimage_overflow
2016-10-20 13:04:54 +00:00
Alexander Alekhin
052e62532a
Merge pull request #7520 from kesinger:memsetform
2016-10-20 12:56:18 +00:00
Alexander Alekhin
d18e45b442
Merge pull request #7524 from tomoaki0705:fixDivFixtureArm
2016-10-20 09:37:13 +00:00
Vincent Rabaud
a89aa8c90a
Fix imageSize overflow in IplImage
2016-10-20 11:23:45 +02:00
Tomoaki Teshima
971a7c88dc
let the performance test pass on ARM
...
* use round-to-neaerest in div of carotene
2016-10-20 10:44:34 +09:00
Pavel Rojtberg
01b592c8e1
calibrateCamera: mask f_x when using FIX_ASPECT_RATIO
...
this avoids a singular Jacobian such that LM converges when DECOMP_LU is
used.
2016-10-19 14:20:39 +02:00
Jake Kesinger
bd50553149
videoio: Fix for valgrind warning in icvGetPropertyCAM_V4L
...
https://github.com/opencv/opencv/issues/7380
2016-10-18 14:18:35 -04:00
Maksim Shabunin
157a90ac46
Merge pull request #7513 from abratchik:fix.wrappers.for.video.tracking
2016-10-18 12:09:14 +00:00
Alexander Alekhin
3a3dfcbdce
Merge pull request #7509 from lpea:camv4l_segfault
2016-10-18 11:32:31 +00:00
abratchik
c72fbd7a14
fix for #7501
2016-10-18 09:38:57 +04:00
Guillaume Jacob
df2b591896
videoio: fix segfault if CONVERT_RGB is false (issue #7465 )
2016-10-17 23:01:30 +02:00
Alexander Alekhin
07711e404b
Merge pull request #7506 from mshabunin:x11-collide-warning
2016-10-17 19:50:30 +00:00
Alexander Alekhin
e15acd4fcf
Merge pull request #7508 from alalek:fix_optflow_test
2016-10-17 19:49:28 +00:00
Alexander Alekhin
5dfb810327
video: fix optflow test: NAN results shouldn't bypass checks
2016-10-17 20:06:45 +03:00
Alexander Alekhin
8213e57f3b
Merge pull request #7494 from tomoaki0705:fixVideoLKPyramidARM
2016-10-17 17:06:26 +00:00
Alexander Alekhin
505c19bc20
Merge pull request #7505 from LukeZheZhu:filterSmall_double_support
2016-10-17 10:33:52 +00:00
Vadim Pisarevsky
27c8f8a1d4
Merge pull request #7443 from Tytan:akaze
2016-10-17 09:22:52 +00:00
mshabunin
6a66af72c8
Added warning about possible X11 macro collision
2016-10-17 12:07:27 +03:00
LukeZhu
ef47bcc88b
Fix the problem: filterSmall.cl report error with double
2016-10-17 15:12:42 +08:00
Alexander Alekhin
18327aed30
Merge pull request #7496 from abratchik:java.wrapper.fix.3.1
2016-10-16 16:49:33 +00:00
Arek
4ea27061ee
Merge pull request #7472 from ArkadiuszRaj:aravis-autoexposure
...
Aravis SDK: Basic software based autoexposure control
* Basic software based autoexposure control
* Aravis autoexposure: skip frame taken while changing exposure setup
2016-10-16 19:14:58 +03:00
abratchik
8da1303179
add vector_vector_KeyPoint support to python wrappers
2016-10-16 19:09:35 +04:00
abratchik
adbb1471fc
fix regression issues in Feature2D and DescriptorMatcher interfaces
2016-10-16 13:36:40 +04:00
Tomoaki Teshima
ea4ff91861
fix error from performance test of LK pyramid
2016-10-16 17:21:37 +09:00
Alexander Alekhin
1ae27eb696
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1
2016-10-15 09:21:45 +00:00
Alexander Alekhin
e2e1485373
Merge pull request #7487 from StevenPuttemans:add_compute_capabilities
2016-10-15 09:19:22 +00:00
Alexander Alekhin
9c6d063750
Merge pull request #7490 from alalek:ios_disable_ippicv
2016-10-15 09:18:15 +00:00
abratchik
4207ebbce7
fix for VideoCapture crash
2016-10-15 08:16:31 +04:00
Alexander Alekhin
d1e8651aae
ios: disable IPPICV on i386-iPhoneSimulator
2016-10-15 03:29:21 +03:00
Vitaly Tuzov
1d045f2731
Added test for drawing beyond 32768 column
2016-10-14 18:38:01 +03:00
Vitaly Tuzov
26c9889c6b
Fix for incorrect line drawing beyond 32768 row or column
2016-10-14 18:37:59 +03:00
Alexander Alekhin
de85680a6a
Merge pull request #7483 from paroj:addtext
2016-10-14 14:06:50 +00:00
Pavel Rojtberg
a37a6bd783
fix BGR <> RGB swap
...
we are drawing on a BGR image declared as RGB, so we should not swap
components here either.
2016-10-14 12:06:50 +02:00
Pavel Rojtberg
8cc09f1784
highgui: allow wrapping cv::addText
...
also correctly forward spacing parameter in fontQt
2016-10-14 12:06:49 +02:00
Maksim Shabunin
18bd47c9b9
Merge pull request #7367 from terfendail:ovxhal_imgprocfix
2016-10-14 09:49:28 +00:00
StevenPuttemans
fa32abe5f3
add 5.2 and 6.1 compute capability support
2016-10-14 10:14:12 +02:00
Alexander Alekhin
0d0a399a13
Merge pull request #7468 from StevenPuttemans:fix_single_scale_detection
2016-10-13 16:19:18 +00:00
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
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
