Mansour Moufid
b7be49426d
Cast some image coordinates and sizes to double.
2015-02-24 12:21:34 -05:00
Alexander Smorkalov
96d7bcc2a9
Merge pull request #3677 from ilya-lavrenov:cuda_backport
2015-02-24 15:06:15 +00:00
Vadim Pisarevsky
2d2ecbf3ee
Merge pull request #3653 from StevenPuttemans:add_annotationtool
2015-02-24 13:50:39 +00:00
Ilya Lavrenov
e03136e951
backport from master
2015-02-24 16:05:21 +03:00
Alexander Smorkalov
1c6e9fdfae
Merge pull request #3735 from SpecLad:align-cpack-variables
2015-02-24 11:42:40 +00:00
Maksim Shabunin
d56dd0e091
Merge pull request #3727 from StevenPuttemans:fix_3714_2.4
2015-02-24 10:08:43 +00:00
Maksim Shabunin
baabd95f30
Merge pull request #3740 from StevenPuttemans:fix_3028_2.4
2015-02-24 10:06:20 +00:00
Alexander Smorkalov
877058aaed
Merge pull request #3739 from ilya-lavrenov:2_4_cc
2015-02-24 09:35:32 +00:00
Mansour Moufid
42b1c6440c
Cast some matrix sizes to type int.
2015-02-23 23:19:33 -05:00
Mansour Moufid
35a89b1541
Change some vector mask types to unsigned.
2015-02-23 23:10:57 -05:00
Alexander Nitsch
8ae6402799
Fix MinGW detection on x86
...
MinGW-w64 always uses "w64" as vendor key which the previously
used check for "64" anywhere in the target triplet matched. This
would lead to MinGW-w64 setups always being treated as x64.
Since we are actually interested in finding the "64" in the
triplet's operating system key, this fix makes sure to look for
"mingw64" and thus avoids the false match.
Fixes issue #3835 . Credits to Lode Leroy for the original patch.
2015-02-23 15:03:28 +01:00
StevenPuttemans
720fd144ef
add fit ellipse technique notice
2015-02-23 14:59:40 +01:00
Ilya Lavrenov
0832b47d21
fixed cross-compilation for Android with CUDA
2015-02-22 13:18:57 +03:00
Alexander Smorkalov
dcc569ee5c
Merge pull request #3721 from nitsch:fix-cmake-current-list-dir
2015-02-21 16:49:36 +00:00
Alexander Smorkalov
0cbe2f2eab
Merge pull request #3708 from StevenPuttemans:fix_traincascade_load_message
2015-02-21 16:47:58 +00:00
Alexander Smorkalov
3df13ff564
Merge pull request #3732 from StevenPuttemans:fix_4004_2.4
2015-02-21 16:46:41 +00:00
Alexander Nitsch
c2944dbc0c
Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR
...
This avoids violation of possible future CMake policy checks
regarding reserved/read-only variables.
2015-02-20 19:55:46 +01:00
Andrey Pavlenko
c059f7ddcd
Merge pull request #3726 from asmorkalov:ocv_version_inc4
2015-02-20 16:11:58 +00:00
Roman Donchenko
cf54e3b97e
Mark the libs component required
...
Everything else depends on it, after all.
2015-02-20 18:37:21 +03:00
Roman Donchenko
6d52ea8984
Add component display names
2015-02-20 18:22:01 +03:00
Roman Donchenko
b8c60234c3
Update the CPack variables to match the changes in asmorkalov/CMake#1
...
Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.
2015-02-20 18:21:47 +03:00
StevenPuttemans
2136c3f3c8
add remarks for iOS tutorial
2015-02-20 15:14:36 +01:00
Vadim Pisarevsky
a46166d30f
Merge pull request #3710 from asmorkalov:aarc64_manager_android_5
2015-02-20 13:02:07 +00:00
Vadim Pisarevsky
85fd599939
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
2015-02-20 12:32:35 +00:00
Vadim Pisarevsky
f3210b58a1
Merge pull request #3723 from SpecLad:run-all-tests-windows
2015-02-20 12:28:15 +00:00
Vadim Pisarevsky
d34a52042e
Merge pull request #3704 from SpecLad:win-install-data
2015-02-20 12:27:35 +00:00
Vadim Pisarevsky
99ae48f0b4
Merge pull request #3707 from alalek:fix_android_camera
2015-02-20 12:27:13 +00:00
Alexander Smorkalov
96e5300fdd
OpenCV and OpenCV Manager version++
2015-02-20 15:17:11 +03:00
StevenPuttemans
4f621de849
fix bug 3714 2.4 branch
2015-02-20 12:39:31 +01:00
Alexander Smorkalov
3649a1a179
Build fix for case without TegraDetector.
2015-02-20 13:29:58 +03:00
Alexander Smorkalov
352485fc54
Android 5 support and aarch64-related fixes for Android Manager.
2015-02-20 13:16:33 +03:00
Roman Donchenko
c1e3ca170e
Add a script to run all tests on Windows
...
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
2015-02-20 12:38:25 +03:00
Alexander Nitsch
9665e08bac
Implement CMAKE_CURRENT_LIST_DIR for older CMake
...
The use of built-in CMAKE_CURRENT_LIST_DIR requires at least
CMake 2.8.3. This fix properly defines the variable to allow its
use in versions < 2.8.3 as well.
Fixes issue #4205 .
2015-02-20 00:55:26 +01:00
Vadim Pisarevsky
65e4df751c
Merge pull request #3705 from SpecLad:unused-nNull
2015-02-19 18:40:22 +00:00
Alexander Alekhin
4e8aac5308
Merge pull request #3683 from SeninAndrew:2.4
2015-02-18 17:15:10 +00:00
Vadim Pisarevsky
a649aea82a
Merge pull request #3699 from SpecLad:rm-component-install
2015-02-18 13:55:07 +00:00
Vadim Pisarevsky
4fcfcfd002
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib
2015-02-18 12:50:10 +00:00
Vijay Pradeep
4ce31c7c1a
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
2015-02-17 10:16:44 -08:00
Vijay Pradeep
49bc100e51
Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
2015-02-17 09:19:36 -08:00
StevenPuttemans
f5a14e5594
fix message of preloaded parameters
2015-02-17 10:21:31 +01:00
Alexander Alekhin
dc21a0a6b5
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
2015-02-17 01:28:43 +03:00
Roman Donchenko
d218f28070
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
2015-02-16 19:31:51 +03:00
Roman Donchenko
e8a7394009
Install data and test data on Windows
...
Because why not?
2015-02-16 19:24:07 +03:00
Vadim Pisarevsky
6a3a6416d7
Merge pull request #3698 from SpecLad:avcodec-free-frame
2015-02-16 11:33:00 +00:00
Vadim Pisarevsky
9e3a826263
Merge pull request #3697 from tomi44g:2.4
2015-02-16 11:28:02 +00:00
Roman Donchenko
8714219dab
Merge pull request #3695 from SpecLad:fix-hdc-tautology
2015-02-13 14:09:07 +00:00
Roman Donchenko
6c4b3c1efe
Merge pull request #3693 from SpecLad:no-absolute-destinations
2015-02-13 14:06:54 +00:00
Roman Donchenko
49fe496914
Remove useless CPACK_*_COMPONENT_INSTALL variables
...
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
2015-02-13 15:31:19 +03:00
Roman Donchenko
77578d415f
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
2015-02-13 15:12:52 +03:00
Thomas Gabrowski
ff4c42d182
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
2015-02-13 00:51:03 +00:00