Alexander Alekhin
8bb8f8dcae
Merge pull request #6752 from alalek:backport_6747
2016-06-30 11:26:49 +00:00
Vitaliy Lyudvichenko
c3dc7266d1
Fixing of AutoBuffer::allocate(nsz) method
...
AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.
2016-06-30 13:10:53 +03:00
Alexander Alekhin
54f190cba3
Merge pull request #6692 from ilya-lavrenov:lintian
2016-06-17 09:44:20 +00:00
Ilya Lavrenov
6677f81779
fixed lintian warnings
2016-06-17 11:00:36 +03:00
Alexander Alekhin
dafb4b81da
Merge pull request #6691 from alalek:cmake_fix_android_samples_2.4
2016-06-16 15:56:33 +00:00
Alexander Alekhin
c6be51eecd
cmake: fix JNI configuration problem for Android samples
...
Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
with following build error message:
ld: fatal error: -soname: must take a non-empty argument
Linker command line sample contains this:
"-shared -Wl,-soname, -o"
2016-06-16 16:08:35 +03:00
Alexander Alekhin
aa861520f6
Merge pull request #6689 from ilya-lavrenov:il/fix
2016-06-16 11:39:20 +00:00
Ilya Lavrenov
e0d64df763
fixed -Wunused-result warning
2016-06-16 12:53:59 +03:00
Alexander Alekhin
77849d0033
Merge pull request #6654 from asmorkalov:gzip_timestamp
2016-06-08 14:32:45 +00:00
Alexander Smorkalov
9fee699693
Fixed package-contains-timestamped-gzip lintian warning for Debian packages.
2016-06-08 14:18:38 +03:00
Alexander Alekhin
19e79d6727
Merge pull request #6596 from asmorkalov:g++5_abi
2016-05-27 12:44:38 +00:00
Alexander Smorkalov
a8b2b4dba1
Packaging fixes for Ubuntu 16.04.
2016-05-27 13:46:12 +03:00
Maksim Shabunin
2124cb1192
Merge pull request #6545 from alalek:backport_6541
2016-05-18 09:39:48 +00:00
Maksim Shabunin
fb598bb76a
Disabled PCH support for gcc >= 6.0.0
...
Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option.
2016-05-16 15:00:16 +03:00
Alexander Alekhin
59975db6a4
Merge pull request #6441 from asmorkalov:version++
2016-04-20 14:21:19 +00:00
Alexander Alekhin
ec2ff7f0c0
Merge branch '2.4.12.x-prep' into 2.4
2016-04-20 16:26:12 +03:00
Alexander Alekhin
5d038686b1
Merge pull request #6401 from StevenPuttemans:add_model_visualisation_tool_2.4
2016-04-20 13:24:25 +00:00
Alexander Smorkalov
6084901610
OpenCV version++.
2016-04-20 16:03:47 +03:00
Alexander Alekhin
e58c28974b
Merge pull request #6431 from StevenPuttemans:add_fixed_video_2.4
2016-04-19 14:19:41 +00:00
Alexander Alekhin
1b4bd6a905
Merge pull request #6432 from kevin-coder:bugfix_6317_Restore_2.4
2016-04-19 13:32:44 +00:00
StevenPuttemans
67fe57a0a3
add fixed video
2016-04-19 15:30:49 +02:00
Kevin, Hu
db0ae2ca50
Restore 2.4 source branch for bug fix 6317.
2016-04-19 19:27:42 +08:00
Alexander Alekhin
de164b0ccf
Merge pull request #6421 from alalek:backport_6417
2016-04-18 15:12:17 +00:00
Suleyman TURKMEN
194f1beae8
fix for writing 16-bit jpeg2000
2016-04-18 14:51:55 +03:00
Maksim Shabunin
3bd6912e01
Merge pull request #6415 from mshabunin:fix-xcode-warnings-24
2016-04-16 06:39:00 +00:00
Maksim Shabunin
1a41ed2fda
Updates for XCode 7.3
2016-04-15 21:56:50 +03:00
StevenPuttemans
9d71c19939
add visualisation tool for 2.4 branch
2016-04-14 11:33:37 +02:00
Alexander Alekhin
5b73f3a316
Merge pull request #6373 from terfendail:vt/stereobm_valgrind
2016-04-13 13:38:53 +00:00
Maksim Shabunin
96d747f030
Merge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4
2016-04-13 10:02:56 +00:00
StevenPuttemans
5164c4ba31
vectorize process + enable early quitting/storage + enable delete annotation option
2016-04-13 09:10:24 +02:00
Vitaly Tuzov
13858cd561
Cost estimation boundaries description updated
2016-04-12 17:31:12 +03:00
Vitaly Tuzov
772d9689e9
Backport of StereoBM uninitialized memory access problem fix from master branch
2016-04-12 17:27:16 +03:00
Maksim Shabunin
ff3bb9f4e6
Merge pull request #6383 from alalek:backport_6381
2016-04-12 08:40:01 +00:00
Maksim Shabunin
e90b697cb0
Merge pull request #6386 from mshabunin:fix-python-test-issue
2016-04-12 08:29:44 +00:00
Maksim Shabunin
70bc268c1a
Fixed problem with nonfree python test: could not find local test images
2016-04-11 18:45:14 +03:00
Philipp Hasper
b6d8c9d990
operator<< handles keys starting with underscore
2016-04-11 12:43:58 +03:00
Vitaly Tuzov
a7ce9a176b
Fixed uninitialized memory errors in stereoBM
2016-04-07 23:58:17 +03:00
Alexander Alekhin
52ba3778e3
Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24
2016-04-05 16:29:15 +00:00
Alexander Alekhin
c7b6353a3c
Merge pull request #6365 from terfendail:vt/nonlocal_testdata
2016-04-05 15:25:15 +00:00
Vitaly Tuzov
34b3d31f54
Fix for nonlocal data requirement in test2.py
2016-04-05 16:47:29 +03:00
Alexander Alekhin
6f139b4f8e
ffmpeg: interrupt callback fix
...
backport from master
2016-04-05 14:19:44 +03:00
Alexander Alekhin
86a725933a
Merge pull request #6343 from terfendail:vt/python_rng_seed_backport
2016-03-29 16:06:27 +00:00
Vitaly Tuzov
64f02aa72d
Backport of setRNGSeed implementation and python test randomness fix
2016-03-29 18:05:28 +03:00
Alexander Alekhin
12a8f5486d
Merge pull request #6341 from SpecLad:destroy-leak
2016-03-29 12:36:51 +00:00
Roman Donchenko
97ac59cb73
Fix a memory leak indirectly caused by cvDestroyWindow
2016-03-29 14:06:05 +03:00
Alexander Smorkalov
762965897a
Merge pull request #6320 from terfendail:vt/pytestarm64
2016-03-24 17:16:52 +00:00
Vitaly Tuzov
ea3746bd15
Made texture flow python test less strict to fix it on AARCH64
2016-03-23 20:07:42 +03:00
Alexander Smorkalov
ef2a376baf
Merge pull request #6297 from terfendail:vt/pytestarm
2016-03-21 15:01:04 +00:00
Maksim Shabunin
dc8bb23a7d
Merge pull request #6287 from StevenPuttemans:add_num_features_info_2.4
2016-03-21 14:09:21 +00:00
Vitaly Tuzov
24361733e4
Fixed face detection python test
2016-03-18 17:44:45 +03:00
