19518 Commits

Author SHA1 Message Date
Pavel Rojtberg
08dd126f08 do not parse empty default values and improve error messages 2015-09-18 18:42:14 +02:00
Alexander Alekhin
0051208684 Merge pull request #5349 from lupustr3:pvlasov/tls_update 2015-09-18 14:39:08 +00:00
Alexander Alekhin
d2b10d8aa1 Merge pull request #5355 from renatoGarcia:master 2015-09-18 13:38:29 +00:00
Alexander Alekhin
e1b0d341e4 Merge pull request #5360 from SpecLad:test2-fail-on-failed-download 2015-09-18 12:10:52 +00:00
Alexander Alekhin
1b2c11e7b3 Merge pull request #5343 from paroj:boolean_algebra 2015-09-18 12:06:31 +00:00
Sergey Alexandrov
4094b2d7a5 Use stream argument when launching bilateral filter kernel 2015-09-18 13:12:58 +02:00
Alexander Alekhin
af0942c78f Merge pull request #5335 from Dikay900:ports_to_master 2015-09-18 11:06:08 +00:00
Pavel Rojtberg
f0282337e3 simplify error conditions
`A || !A` is `true` so write `(A && B) || !A` as `B || !A`
2015-09-18 12:12:49 +02:00
jisli
f88e9a748a update ffmpeg support
Migration have been done for these ffmpeg/libav changes:

2013-12-11 - 29c83d2 / b9fb59d,409a143 / 9431356,44967ab / d7b3ee9 - lavc 55.45.101 / 55.28.1 - avcodec.h
  av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
  used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
  avcodec_free_frame() respectively. The latter three functions are deprecated.

2012-10-08 - ae77266 / 78071a1 - lavu 51.74.100 / 51.42.0 - pixfmt.h
  Rename PixelFormat to AVPixelFormat and all PIX_FMT_* to AV_PIX_FMT_*.
  To provide backwards compatibility, PixelFormat is now #defined as
  AVPixelFormat.
  Note that this can break user code that includes pixfmt.h and uses the
  'PixelFormat' identifier. Such code should either #undef PixelFormat
  or stop using the PixelFormat name.
2015-09-17 20:24:37 +03:00
Roman Donchenko
08ad3b500b test2.py: switch from urllib to urllib2
urllib2 raises an exception if an HTTP request produces an error code,
making the test fail earlier.
2015-09-17 18:24:30 +03:00
Roman Donchenko
56f17e4921 test2.py: fail if a downloaded image can't be decoded 2015-09-17 18:17:06 +03:00
Roman Donchenko
293ea03dcc test2.py: remove unused imports 2015-09-17 18:14:49 +03:00
Pavel Vlasov
aa485ccd75 TLS keys leak fix;
Disables TLS copy constructor and operator, as they can lead to errors and reservation of too much keys in TLS storage;

gather method was added to TLS to gather data from all threads;
2015-09-17 15:49:20 +03:00
StevenPuttemans
e9037644c3 add link to contributing guidelines 2015-09-17 14:15:20 +02:00
StevenPuttemans
bef1b5322e add link to contributing guidelines 2015-09-17 14:14:21 +02:00
Alexander Smorkalov
e6f3f3c029 OpenCV version++. 2.4.12.2 2015-09-17 14:02:36 +03:00
Ilya Lavrenov
7746d9b7cc fix for corrent modules dependencies
(cherry picked from commit 1c3d83df54d2f39c9403126bf3c1374eaf749dee)
2015-09-17 13:45:08 +03:00
Vladislav Vinogradov
3494d640df add extra checks to data_step_down to prevent out-of-border access
(cherry picked from commit 3ef067cc65cd548a968588f72d3b9ecc92a0e9bb)
2015-09-17 13:44:56 +03:00
Vladislav Vinogradov
c22cc67ba8 revert previous change in gpu::StereoBeliefPropogation
(cherry picked from commit f903192c17b1c70182c0c25bb156900ea82b731b)
2015-09-17 13:44:33 +03:00
Vladislav Vinogradov
558054a53d fix for gpu::StereoBeliefPropogation:
use continuous memory for internal buffers

(cherry picked from commit e2a9df408f712f694206974a1f24a864881371c3)
2015-09-17 13:44:17 +03:00
Elena Shipunova
c7b471f10f do not proceed with removing zero-length slice
(cherry picked from commit 036c3b4e6d45dcf81181bb2658601f758c976088)
2015-09-17 13:43:54 +03:00
Ilya Lavrenov
f4ffcae8d9 initialize padding of CvString with zeros
(cherry picked from commit 7b1eb3af7bb82dfd9258f6abdec350688cf65b51)
2015-09-17 13:43:37 +03:00
Ilya Lavrenov
0422054aa1 fixed warnings in gpu module
(cherry picked from commit 6a05939e1ce552008ecf95451ddf362f2be7a4c3)
2015-09-17 13:41:51 +03:00
Ilya Lavrenov
a81f0a5123 fixed uninitialized memory writing/reading in flann
(cherry picked from commit 3934d61de7d34e9ac8040cf5ced349a51ad2e520)
2015-09-17 13:41:31 +03:00
Ilya Lavrenov
c36582d2df fixed memory leak in flann index
(cherry picked from commit 32d7c1950a562d038ff6f8b810ee46298a83fc39)
2015-09-17 13:41:16 +03:00
Ilya Lavrenov
d50c07e303 fixed "Conditional jump or move depends on uninitialised value(s)" in GBD
(cherry picked from commit 887736bcd4365cff0531e6f763b604a1c6e92e25)
2015-09-17 13:41:03 +03:00
Ilya Lavrenov
54693b3fa7 fixed memory leak in GBTrees
(cherry picked from commit 1b8c2589c057f862008cd1a3be5c8802b7bf1994)
2015-09-17 13:40:50 +03:00
Ilya Lavrenov
3c3bc123fc release filestorage before exception
(cherry picked from commit 3a1bb933401446b442348026b9cb680d35f3f449)
2015-09-17 13:40:36 +03:00
Ilya Lavrenov
ac33cd688c fixed memory leak in ANN
(cherry picked from commit dfb49097e3013fa279d5882700601f5cabd6cbd8)
2015-09-17 13:40:14 +03:00
Ilya Lavrenov
b5e42d8cc1 fixed memory leak in ml module
(cherry picked from commit d7bb1025f32ed268da7230cae3e8cb413dbab282)
2015-09-17 13:40:02 +03:00
Ilya Lavrenov
7e4e8921bc fixed memory leak in descriptor regression tests 2015-09-17 13:39:44 +03:00
Ilya Lavrenov
6dcd455ac4 fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp 2015-09-17 13:39:34 +03:00
Vladislav Vinogradov
1d58e1a14a fix potential out-of-border access in gpu StereoBeliefPropagation 2015-09-17 13:39:17 +03:00
Roman Donchenko
d122510c4f Only conflict with packages corresponding to modules that are built 2015-09-17 13:39:03 +03:00
Roman Donchenko
6613d14261 Add missing packages to the Debian conflict list
And refactor the code to make sure that the dev and runtime package lists are
in sync.
2015-09-17 13:38:52 +03:00
a-andre
a14e524b32 fix documentation builder warnings 2015-09-17 13:38:25 +03:00
a-andre
226ff93917 install new headers like "opencv2/core.hpp" 2015-09-17 13:38:11 +03:00
Ilya Lavrenov
d28e6c9b36 fixed memory leak caused by illegal memory access
(cherry picked from commit 4722b2d0e5b2caf053e53612ea277451c5cc53a0)
2015-09-17 13:37:52 +03:00
Ilya Lavrenov
c16f465ff5 fixed "Conditional jump or move depends on uninitialised value" warning
(cherry picked from commit f100cdb6d4373c93abc2b5613fae505ed3ce876d)
2015-09-17 13:37:38 +03:00
Roman Donchenko
3231c2f995 NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG()
This ensures that test data is not dependent on the order the tests are
executed in.

(cherry picked from commit 1245cd175283b11800bbbdc52287957cc3d76417)
2015-09-17 13:37:26 +03:00
Ilya Lavrenov
16bcc30e42 typo
(cherry picked from commit 793bdaada7f170cf3fbaf3b421bb3054f37e8a63)
2015-09-17 13:37:12 +03:00
Ilya Lavrenov
69c50e0181 fixed typo
(cherry picked from commit 370d1ff21a99046021da39b74f4081a5b69ce57e)
2015-09-17 13:37:02 +03:00
Ilya Lavrenov
486c40f578 fixed uninitialized values warning in bad arg test class
(cherry picked from commit 47cee8715bb086f6b0ca0f5b301d2eec87ce9f2a)
2015-09-17 13:36:51 +03:00
Ilya Lavrenov
08e38e9ff9 fixed memory leaks in warpAffine tests
(cherry picked from commit b70e27e076a7eea6a1ccc6bb5f367e539e1aa51c)
2015-09-17 13:36:35 +03:00
Ilya Lavrenov
ba3b902da7 fixed memory leaks in floodfill tests
(cherry picked from commit d1b882ddcf54e52ac70bb17540c84c4a93553add)
2015-09-17 13:36:24 +03:00
Ilya Lavrenov
bf94e6a91c fixed memory leaks in cvtyuv tests
(cherry picked from commit b2489d31d66599ac2aaa79af2b753a24649776aa)
2015-09-17 13:36:14 +03:00
Ilya Lavrenov
ecc53dd7a4 fixed memory leak in core ds tests
(cherry picked from commit 7719da95526b81af0195a3576774eaac605cd045)
2015-09-17 13:35:51 +03:00
Ilya Lavrenov
fc0e0239b8 fixed valgrind warning in polylines
(cherry picked from commit 855765986e9cd5c730730dd1f45175b182e737fa)
2015-09-17 13:35:25 +03:00
Renato Florentino Garcia
1a18fa1c94 Correct a typo. 2015-09-16 21:16:23 -03:00
Hajo Nils Krabbenhöft
7825cbeb7d buffer_size should be in bytes, not bits 2015-09-16 22:19:51 +02:00