Vadim Pisarevsky
2c57717ca2
Merge pull request #3774 from JoeHowse:2.4
2015-03-03 12:31:29 +00:00
Joe Howse
e9b4813bb2
Cat face detection cascades
2015-03-02 11:58:08 -04:00
Vadim Pisarevsky
9185b62a1d
Merge pull request #3761 from StevenPuttemans:fix_smile_model
2015-03-02 11:49:41 +00:00
Vadim Pisarevsky
ac8045b9c6
Merge pull request #3754 from eliteraspberries:unsigned-mask
2015-03-02 11:34:43 +00:00
Vadim Pisarevsky
417f1e51a4
Merge pull request #3755 from eliteraspberries:mat-size-sign
2015-03-02 11:34:09 +00:00
Vadim Pisarevsky
b595812bd0
Merge pull request #3745 from nitsch:fix-mingw-detection
2015-03-02 10:55:00 +00:00
Vadim Pisarevsky
0172bd6beb
Merge pull request #3756 from eliteraspberries:cast-double
2015-03-02 10:52:28 +00:00
Vadim Pisarevsky
e02d6e2c8f
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
2015-03-02 10:49:38 +00:00
Vadim Pisarevsky
7458dfc082
Merge pull request #3765 from jet47:gpu-hog-fix
2015-03-02 10:34:51 +00:00
Vadim Pisarevsky
bed8cb42be
Merge pull request #3768 from jet47:gpumat-set-to
2015-03-02 10:33:45 +00:00
Vladislav Vinogradov
4f5d30a865
fix GpuMat::setTo implementation
...
previous implementation was not thread/stream safe, since it used constant
memory
new implementation doesn't use any global objects, so it is thread/stream safe
2015-02-27 16:28:06 +03:00
StevenPuttemans
2c0ef660bf
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
...
This solves the undesired consequence of breaking the GPU interface.
2015-02-27 14:15:30 +01:00
Vladislav Vinogradov
21bbed7baf
fix gpu HOG implementation:
...
move hog::set_up_constants from constructor to compute method
if user changed CUDA device between constructor and computation,
some variables were uninitialized
2015-02-27 14:28:12 +03:00
StevenPuttemans
1e95c964f3
fixing model size, typo in previous PR
2015-02-26 15:53:00 +01:00
Vadim Pisarevsky
2c9547e314
Merge pull request #3747 from StevenPuttemans:fix_annotationtool_extras
2015-02-25 12:10:31 +00:00
Alexander Smorkalov
f73a97b53b
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
2015-02-25 11:54:44 +00:00
StevenPuttemans
387a0f26fb
fix annotation tool, add auto make of tool
2015-02-25 11:27:59 +01:00
Vladislav Vinogradov
c147ab1e85
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
2015-02-25 13:16:36 +03:00
Alexander Nitsch
a5b293b412
Fix setting of architecture for MinGW builds
...
The architecture has been correctly determined earlier in this
file. No need to do it again.
2015-02-24 23:13:27 +01:00
Mansour Moufid
7d4cbbd7aa
Cast a long integer to double explicitly.
2015-02-24 17:04:28 -05:00
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
