Vadim Pisarevsky
719099ad6d
Merge pull request #4104 from SpecLad:arm64-packaging
2015-06-16 13:19:11 +00:00
Vadim Pisarevsky
2e9004813e
Merge pull request #4088 from howtobeahacker:2.4
2015-06-16 12:31:13 +00:00
Vincent Rabaud
50842b9036
get code to compile on Ubuntu Saucy
...
A define was forgotten for the codecs and there was a typo for
another.
(cherry picked from commit f052b0bc4d
)
Conflicts:
modules/videoio/src/ffmpeg_codecs.hpp
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
3d6413cfc6
fixed compile warnings; hopefully fixed test failures
...
(cherry picked from commit 30912b49f3
)
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
)
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp
2015-06-09 15:53:08 +03:00
Alexander Smorkalov
57ab0d4d17
Debian packages header update to fix conflict with OpenCV from deb repo.
2015-06-09 14:59:12 +03:00
Roman Donchenko
02f8b85dd9
Add ARM64 packaging support
2015-06-08 18:03:08 +03:00
Roman Donchenko
1fbdca0c9b
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
...
Because that's the variable actually used by CPack.
2015-06-08 18:03:07 +03:00
howtobeahacker
9eaac6105f
correct covariation matrix formula in Harris corner detector
2015-06-03 17:33:40 +08:00
Vadim Pisarevsky
83ace8d580
Merge pull request #4085 from berak:patch-3
2015-06-03 07:25:17 +00:00
berak
851ce27240
http://code.opencv.org/issues/4359 2.4 branch
2015-06-03 07:48:29 +02:00
Vadim Pisarevsky
70f8d807c8
Merge pull request #4003 from uwinsoftware:2.4
2015-05-29 18:55:55 +00:00
Vadim Pisarevsky
daa21a4385
Merge pull request #4057 from apavlenko:24_java_memory_release
2015-05-28 14:59:46 +00:00
Vadim Pisarevsky
13cef0cdfc
Merge pull request #4061 from ilya-lavrenov:android
2015-05-26 17:24:05 +00:00
Ilya Lavrenov
083aced3b4
fixed OS names
2015-05-26 17:41:23 +03:00
Andrey Pavlenko
72ec9c159e
releasing native memory of temp Mat
objects in generated Java code
2015-05-26 13:58:54 +03:00
Andrey Pavlenko
5b00d9da49
releasing native memory in Java converters
2015-05-26 13:58:35 +03:00
Vadim Pisarevsky
74bb0beeb0
Merge pull request #4008 from cr333:triangulation_fix_2.4
2015-05-23 10:18:08 +00:00
Vadim Pisarevsky
08714c510f
Merge pull request #4042 from ilya-lavrenov:android_mk
2015-05-21 13:17:46 +00:00
Vadim Pisarevsky
acfbed8654
Merge pull request #4037 from Lectem:patch-1
2015-05-21 12:33:42 +00:00
Vadim Pisarevsky
6212084046
Merge pull request #4041 from ilya-lavrenov:warning_fix
2015-05-21 12:24:46 +00:00
Ilya Lavrenov
d89b6226a3
fixed Android mk generation for arm64-v8a
2015-05-21 15:00:46 +03:00
Ilya Lavrenov
11d1909e6b
fixed warning
2015-05-21 11:49:06 +03:00
Lectem
3c6fe75149
fix mutex for uclibc
...
The uClibc doesn't have pthread_spin_* implemented on their 'old' linux threads.
Since it is on linux, we have to check if uclibc is using this implementation or not.
2015-05-20 12:18:28 +02:00
Alexander Smorkalov
00d9f690f6
Version++.
2015-05-20 11:21:28 +03:00
Vladislav Vinogradov
ae79fe10dc
do not loose logs from nvidia tests
...
(cherry picked from commit d58d277707
)
2015-05-20 08:16:44 +03:00
Vladislav Vinogradov
62fc342d35
use fixed seed for RNG in gpu SolvePnPRansac test
...
(cherry picked from commit 95eed59f2d
)
2015-05-20 08:16:22 +03:00
Vladislav Vinogradov
36924d6dbb
use cv::theRNG() instead of ::rand() in gpu::solvePnPRansac
...
(cherry picked from commit 62bc647731
)
2015-05-20 08:16:05 +03:00
Alexander Smorkalov
ede4943d7e
Merge pull request #4030 from asmorkalov:as/accurate_cuda_arch_aarch64
2015-05-20 05:12:43 +00:00
Alexander Smorkalov
9d148c76ca
Merge pull request #4033 from jet47:gpu-tests-fix
2015-05-20 05:12:24 +00:00
Vladislav Vinogradov
21d8b588a2
exclude dates from report names
2015-05-19 18:26:13 +03:00
Vladislav Vinogradov
5d66b1130b
save tests console output to separate log files
2015-05-19 18:26:13 +03:00
Vladislav Vinogradov
0550b2c1fe
check that current directory has write access
2015-05-19 18:26:04 +03:00
Vladislav Vinogradov
d58d277707
do not loose logs from nvidia tests
2015-05-19 17:28:43 +03:00
Vladislav Vinogradov
95eed59f2d
use fixed seed for RNG in gpu SolvePnPRansac test
2015-05-19 17:27:50 +03:00
Vladislav Vinogradov
62bc647731
use cv::theRNG() instead of ::rand() in gpu::solvePnPRansac
2015-05-19 17:27:23 +03:00
Alexander Smorkalov
7f63776395
Precise default CUDA version for Tegra X1 chips.
2015-05-19 13:24:17 +03:00
Vadim Pisarevsky
b9792fdc14
Merge pull request #3829 from ippei-i:2.4-flann-lsh-addable-index
2015-05-18 15:38:21 +00:00
Alexander Smorkalov
0410fe6978
Merge pull request #3785 from jet47:tiny-gpu-module
2015-05-18 08:00:12 +00:00
Christian Richardt
242e64c08d
Fixed triangulation bug http://code.opencv.org/issues/4334 .
2015-05-13 15:47:00 +02:00
Vadim Pisarevsky
cc94b393c5
Merge pull request #3975 from StevenPuttemans:RGB_doc_fixing_2.4
2015-05-12 15:12:04 +00:00
Nguyen Nguyen
58dd70e8dc
Revert support for audio
2015-05-08 12:06:03 -04:00
Nguyen Nguyen
53ff537f1c
temporary fixes
2015-05-08 11:33:11 -04:00
Nguyen Nguyen
a5814871d9
Adding audio to opencv
2015-05-06 17:01:38 -04:00
Vadim Pisarevsky
1aa03cecf1
Merge pull request #3981 from patrikhuber:vs2015-support
2015-05-06 15:35:36 +00:00
Vladislav Vinogradov
f10537cdd6
fix tests compilation issue on Windows
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
9d294cbcf5
fix performance tests in tiny mode
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
f1bec940b1
fix accuracy tests in tiny mode
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
dd93d48be4
turn on stereob instantiates that required for tests
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
ad3123adfd
turn on some instantiates that required for other primitives
2015-05-06 17:15:25 +03:00