ippei ito [Tue, 24 Mar 2015 18:11:44 +0000 (03:11 +0900)]
Test accuracy for PR#3829.Fix Some Error, Modify SLA.
ippei ito [Tue, 24 Mar 2015 15:08:47 +0000 (00:08 +0900)]
Test accuracy for Pull Request # 3829
ippei ito [Sat, 14 Mar 2015 00:35:53 +0000 (09:35 +0900)]
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
ippei ito [Fri, 13 Mar 2015 21:58:34 +0000 (06:58 +0900)]
Fix compile error on linux change cv::InputArray& to cv::InputArray
ippei ito [Fri, 13 Mar 2015 21:07:55 +0000 (06:07 +0900)]
Fix unused-parameter Warning
ippei ito [Fri, 13 Mar 2015 19:38:07 +0000 (04:38 +0900)]
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
Alexander Alekhin [Fri, 6 Mar 2015 14:53:42 +0000 (14:53 +0000)]
Merge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation
StevenPuttemans [Thu, 5 Mar 2015 13:22:43 +0000 (14:22 +0100)]
update cmakelists of annotation tool
Vadim Pisarevsky [Tue, 3 Mar 2015 12:31:29 +0000 (12:31 +0000)]
Merge pull request #3774 from JoeHowse:2.4
Joe Howse [Mon, 2 Mar 2015 15:58:08 +0000 (11:58 -0400)]
Cat face detection cascades
Vadim Pisarevsky [Mon, 2 Mar 2015 11:49:41 +0000 (11:49 +0000)]
Merge pull request #3761 from StevenPuttemans:fix_smile_model
Vadim Pisarevsky [Mon, 2 Mar 2015 11:34:43 +0000 (11:34 +0000)]
Merge pull request #3754 from eliteraspberries:unsigned-mask
Vadim Pisarevsky [Mon, 2 Mar 2015 11:34:09 +0000 (11:34 +0000)]
Merge pull request #3755 from eliteraspberries:mat-size-sign
Vadim Pisarevsky [Mon, 2 Mar 2015 10:55:00 +0000 (10:55 +0000)]
Merge pull request #3745 from nitsch:fix-mingw-detection
Vadim Pisarevsky [Mon, 2 Mar 2015 10:52:28 +0000 (10:52 +0000)]
Merge pull request #3756 from eliteraspberries:cast-double
Vadim Pisarevsky [Mon, 2 Mar 2015 10:49:38 +0000 (10:49 +0000)]
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
Vadim Pisarevsky [Mon, 2 Mar 2015 10:34:51 +0000 (10:34 +0000)]
Merge pull request #3765 from jet47:gpu-hog-fix
Vadim Pisarevsky [Mon, 2 Mar 2015 10:33:44 +0000 (10:33 +0000)]
Merge pull request #3768 from jet47:gpumat-set-to
Vladislav Vinogradov [Fri, 27 Feb 2015 13:28:06 +0000 (16:28 +0300)]
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
StevenPuttemans [Fri, 27 Feb 2015 12:18:38 +0000 (13:18 +0100)]
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.
Vladislav Vinogradov [Fri, 27 Feb 2015 11:28:12 +0000 (14:28 +0300)]
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
StevenPuttemans [Thu, 26 Feb 2015 14:53:00 +0000 (15:53 +0100)]
fixing model size, typo in previous PR
Vadim Pisarevsky [Wed, 25 Feb 2015 12:10:31 +0000 (12:10 +0000)]
Merge pull request #3747 from StevenPuttemans:fix_annotationtool_extras
Alexander Smorkalov [Wed, 25 Feb 2015 11:54:44 +0000 (11:54 +0000)]
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
StevenPuttemans [Tue, 24 Feb 2015 15:02:15 +0000 (16:02 +0100)]
fix annotation tool, add auto make of tool
Vladislav Vinogradov [Wed, 25 Feb 2015 10:16:36 +0000 (13:16 +0300)]
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
Alexander Nitsch [Tue, 24 Feb 2015 22:13:27 +0000 (23:13 +0100)]
Fix setting of architecture for MinGW builds
The architecture has been correctly determined earlier in this
file. No need to do it again.
Mansour Moufid [Tue, 24 Feb 2015 22:04:28 +0000 (17:04 -0500)]
Cast a long integer to double explicitly.
Mansour Moufid [Tue, 24 Feb 2015 17:21:34 +0000 (12:21 -0500)]
Cast some image coordinates and sizes to double.
Alexander Smorkalov [Tue, 24 Feb 2015 15:06:15 +0000 (15:06 +0000)]
Merge pull request #3677 from ilya-lavrenov:cuda_backport
Vadim Pisarevsky [Tue, 24 Feb 2015 13:50:39 +0000 (13:50 +0000)]
Merge pull request #3653 from StevenPuttemans:add_annotationtool
Ilya Lavrenov [Thu, 5 Feb 2015 10:23:28 +0000 (13:23 +0300)]
backport from master
Alexander Smorkalov [Tue, 24 Feb 2015 11:42:40 +0000 (11:42 +0000)]
Merge pull request #3735 from SpecLad:align-cpack-variables
Maksim Shabunin [Tue, 24 Feb 2015 10:08:43 +0000 (10:08 +0000)]
Merge pull request #3727 from StevenPuttemans:fix_3714_2.4
Maksim Shabunin [Tue, 24 Feb 2015 10:06:20 +0000 (10:06 +0000)]
Merge pull request #3740 from StevenPuttemans:fix_3028_2.4
Alexander Smorkalov [Tue, 24 Feb 2015 09:35:31 +0000 (09:35 +0000)]
Merge pull request #3739 from ilya-lavrenov:2_4_cc
Mansour Moufid [Tue, 24 Feb 2015 04:17:27 +0000 (23:17 -0500)]
Cast some matrix sizes to type int.
Mansour Moufid [Tue, 24 Feb 2015 04:10:57 +0000 (23:10 -0500)]
Change some vector mask types to unsigned.
Alexander Nitsch [Mon, 23 Feb 2015 14:01:00 +0000 (15:01 +0100)]
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.
StevenPuttemans [Mon, 23 Feb 2015 13:59:40 +0000 (14:59 +0100)]
add fit ellipse technique notice
Ilya Lavrenov [Sun, 22 Feb 2015 09:42:42 +0000 (12:42 +0300)]
fixed cross-compilation for Android with CUDA
Alexander Smorkalov [Sat, 21 Feb 2015 16:49:36 +0000 (16:49 +0000)]
Merge pull request #3721 from nitsch:fix-cmake-current-list-dir
Alexander Smorkalov [Sat, 21 Feb 2015 16:47:58 +0000 (16:47 +0000)]
Merge pull request #3708 from StevenPuttemans:fix_traincascade_load_message
Alexander Smorkalov [Sat, 21 Feb 2015 16:46:41 +0000 (16:46 +0000)]
Merge pull request #3732 from StevenPuttemans:fix_4004_2.4
Alexander Nitsch [Fri, 20 Feb 2015 18:54:14 +0000 (19:54 +0100)]
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.
Andrey Pavlenko [Fri, 20 Feb 2015 16:11:58 +0000 (16:11 +0000)]
Merge pull request #3726 from asmorkalov:ocv_version_inc4
Roman Donchenko [Fri, 20 Feb 2015 15:37:21 +0000 (18:37 +0300)]
Mark the libs component required
Everything else depends on it, after all.
Roman Donchenko [Fri, 20 Feb 2015 15:20:29 +0000 (18:20 +0300)]
Add component display names
Roman Donchenko [Fri, 20 Feb 2015 15:15:20 +0000 (18:15 +0300)]
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.
StevenPuttemans [Fri, 20 Feb 2015 13:25:14 +0000 (14:25 +0100)]
add remarks for iOS tutorial
Vadim Pisarevsky [Fri, 20 Feb 2015 13:02:07 +0000 (13:02 +0000)]
Merge pull request #3710 from asmorkalov:aarc64_manager_android_5
Vadim Pisarevsky [Fri, 20 Feb 2015 12:32:35 +0000 (12:32 +0000)]
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
Vadim Pisarevsky [Fri, 20 Feb 2015 12:28:15 +0000 (12:28 +0000)]
Merge pull request #3723 from SpecLad:run-all-tests-windows
Vadim Pisarevsky [Fri, 20 Feb 2015 12:27:34 +0000 (12:27 +0000)]
Merge pull request #3704 from SpecLad:win-install-data
Vadim Pisarevsky [Fri, 20 Feb 2015 12:27:13 +0000 (12:27 +0000)]
Merge pull request #3707 from alalek:fix_android_camera
Alexander Smorkalov [Fri, 20 Feb 2015 10:46:54 +0000 (13:46 +0300)]
OpenCV and OpenCV Manager version++
StevenPuttemans [Fri, 20 Feb 2015 10:48:55 +0000 (11:48 +0100)]
fix bug 3714 2.4 branch
Alexander Smorkalov [Fri, 20 Feb 2015 10:29:58 +0000 (13:29 +0300)]
Build fix for case without TegraDetector.
Alexander Smorkalov [Tue, 17 Feb 2015 13:54:05 +0000 (16:54 +0300)]
Android 5 support and aarch64-related fixes for Android Manager.
Roman Donchenko [Fri, 20 Feb 2015 09:38:25 +0000 (12:38 +0300)]
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.
Alexander Nitsch [Thu, 19 Feb 2015 23:55:26 +0000 (00:55 +0100)]
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.
Vadim Pisarevsky [Thu, 19 Feb 2015 18:40:22 +0000 (18:40 +0000)]
Merge pull request #3705 from SpecLad:unused-nNull
Alexander Alekhin [Wed, 18 Feb 2015 17:15:10 +0000 (17:15 +0000)]
Merge pull request #3683 from SeninAndrew:2.4
Vadim Pisarevsky [Wed, 18 Feb 2015 13:55:06 +0000 (13:55 +0000)]
Merge pull request #3699 from SpecLad:rm-component-install
Vadim Pisarevsky [Wed, 18 Feb 2015 12:50:09 +0000 (12:50 +0000)]
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib
Vijay Pradeep [Tue, 17 Feb 2015 18:16:44 +0000 (10:16 -0800)]
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
Vijay Pradeep [Tue, 17 Feb 2015 17:19:22 +0000 (09:19 -0800)]
Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
StevenPuttemans [Tue, 17 Feb 2015 09:21:31 +0000 (10:21 +0100)]
fix message of preloaded parameters
Alexander Alekhin [Mon, 16 Feb 2015 22:28:43 +0000 (01:28 +0300)]
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)
Roman Donchenko [Mon, 16 Feb 2015 16:31:51 +0000 (19:31 +0300)]
cap_msmf.hpp: fix a warning about nNull being unused
The two functions featuring nNull are not particularly needed, so
I simply removed them.
Roman Donchenko [Mon, 16 Feb 2015 16:24:07 +0000 (19:24 +0300)]
Install data and test data on Windows
Because why not?
Vadim Pisarevsky [Mon, 16 Feb 2015 11:33:00 +0000 (11:33 +0000)]
Merge pull request #3698 from SpecLad:avcodec-free-frame
Vadim Pisarevsky [Mon, 16 Feb 2015 11:28:02 +0000 (11:28 +0000)]
Merge pull request #3697 from tomi44g:2.4
Roman Donchenko [Fri, 13 Feb 2015 14:09:07 +0000 (14:09 +0000)]
Merge pull request #3695 from SpecLad:fix-hdc-tautology
Roman Donchenko [Fri, 13 Feb 2015 14:06:54 +0000 (14:06 +0000)]
Merge pull request #3693 from SpecLad:no-absolute-destinations
Roman Donchenko [Fri, 13 Feb 2015 12:31:19 +0000 (15:31 +0300)]
Remove useless CPACK_*_COMPONENT_INSTALL variables
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
Roman Donchenko [Fri, 13 Feb 2015 12:12:52 +0000 (15:12 +0300)]
Fix a memory leak in CvCapture_FFMPEG::close
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
Thomas Gabrowski [Fri, 13 Feb 2015 00:51:03 +0000 (00:51 +0000)]
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
Roman Donchenko [Thu, 12 Feb 2015 13:51:26 +0000 (16:51 +0300)]
Don't install documentation if it isn't built
The HAVE_DOC_GENERATOR variable was always true.
Roman Donchenko [Tue, 10 Feb 2015 16:43:29 +0000 (19:43 +0300)]
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
Absolute destinations are not necessary, and prevent CPack from working.
Vadim Pisarevsky [Tue, 10 Feb 2015 12:00:44 +0000 (12:00 +0000)]
Merge pull request #3689 from jet47:test-script-optional-color-2.4
Vladislav Vinogradov [Mon, 9 Feb 2015 12:23:34 +0000 (15:23 +0300)]
make color output in run_test script optional
Andrew Senin [Fri, 6 Feb 2015 21:48:37 +0000 (00:48 +0300)]
Fixing XIMEA parameters mapping (issue #4176)
Vadim Pisarevsky [Sun, 8 Feb 2015 17:07:10 +0000 (17:07 +0000)]
Merge pull request #3680 from jet47:fix-run-tests-script-2.4
Vladislav Vinogradov [Fri, 6 Feb 2015 09:34:50 +0000 (12:34 +0300)]
fix opencv_run_all_tests_unix.sh script:
use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt
Vadim Pisarevsky [Thu, 5 Feb 2015 07:48:43 +0000 (07:48 +0000)]
Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix
Vadim Pisarevsky [Thu, 5 Feb 2015 07:35:01 +0000 (07:35 +0000)]
Merge pull request #3674 from jet47:colorize-run-test-script-2.4
Mansour Moufid [Wed, 4 Feb 2015 15:55:38 +0000 (10:55 -0500)]
Add back the version variables removed in
ab40630f.
Vadim Pisarevsky [Wed, 4 Feb 2015 15:13:44 +0000 (15:13 +0000)]
Merge pull request #3676 from asmorkalov:changelog_for_tests
Alexander Smorkalov [Wed, 4 Feb 2015 13:52:39 +0000 (16:52 +0300)]
Added Debian changelog to -tests package.
Vadim Pisarevsky [Wed, 4 Feb 2015 13:17:51 +0000 (13:17 +0000)]
Merge pull request #3672 from asmorkalov:debian_lower_case
Vadim Pisarevsky [Wed, 4 Feb 2015 13:17:25 +0000 (13:17 +0000)]
Merge pull request #3671 from jet47:disable-gpu-match-template-tests
Vladislav Vinogradov [Wed, 4 Feb 2015 09:38:51 +0000 (12:38 +0300)]
colorize opencv_run_all_tests_unix.sh script output
Alexander Smorkalov [Wed, 4 Feb 2015 08:37:52 +0000 (11:37 +0300)]
Debian package names replaced by lower case version to satisfy lintian.
Vladislav Vinogradov [Wed, 4 Feb 2015 08:21:17 +0000 (11:21 +0300)]
disable gpu::matchTemplate tests
Mansour Moufid [Wed, 4 Feb 2015 04:17:43 +0000 (23:17 -0500)]
Fix indentation of
98a157f5.
Mansour Moufid [Wed, 4 Feb 2015 04:12:50 +0000 (23:12 -0500)]
Remove Apple-specific logic in finding the FFmpeg libraries.
Thanks to SpecLad.
Mansour Moufid [Mon, 2 Feb 2015 16:54:09 +0000 (11:54 -0500)]
Correct the new find_library commands.
Thanks to SpecLad.
AfterEight [Mon, 2 Feb 2015 13:59:52 +0000 (14:59 +0100)]
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
Vadim Pisarevsky [Mon, 2 Feb 2015 10:17:43 +0000 (10:17 +0000)]
Merge pull request #3662 from StevenPuttemans:fix_models