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
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
Mansour Moufid [Sun, 1 Feb 2015 20:51:33 +0000 (15:51 -0500)]
Use the CMake find_library command to find the FFmpeg libraries.
StevenPuttemans [Sun, 1 Feb 2015 14:13:57 +0000 (15:13 +0100)]
fixing wrong model sizes
Vadim Pisarevsky [Sun, 1 Feb 2015 09:14:28 +0000 (09:14 +0000)]
Merge pull request #3660 from asmorkalov:samples_install_permissions
Alexander Smorkalov [Sat, 31 Jan 2015 21:34:23 +0000 (00:34 +0300)]
Fixed samples install permissions for Debian packaging.
Vadim Pisarevsky [Sat, 31 Jan 2015 14:46:40 +0000 (14:46 +0000)]
Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh
Vadim Pisarevsky [Sat, 31 Jan 2015 14:45:11 +0000 (14:45 +0000)]
Merge pull request #3658 from asmorkalov:numpy_dependency
Vadim Pisarevsky [Sat, 31 Jan 2015 14:44:41 +0000 (14:44 +0000)]
Merge pull request #3659 from asmorkalov:debian_changelog_stub
Alexander Smorkalov [Fri, 30 Jan 2015 10:21:52 +0000 (13:21 +0300)]
Added Debian changelog installation step for Debian package generation.
Alexander Smorkalov [Fri, 30 Jan 2015 09:26:08 +0000 (12:26 +0300)]
Added dependency from numpy to debian package with python bindings.
Alexander Smorkalov [Thu, 29 Jan 2015 16:20:18 +0000 (19:20 +0300)]
opencv_testing.sh script installation is removed as run tests script does the same thing.
Vadim Pisarevsky [Thu, 29 Jan 2015 12:14:09 +0000 (12:14 +0000)]
Merge pull request #3649 from StevenPuttemans:fix_tutorials
Vadim Pisarevsky [Thu, 29 Jan 2015 12:12:18 +0000 (12:12 +0000)]
Merge pull request #3587 from vpradeep07:fix/pnpransac_race_cond
Vadim Pisarevsky [Wed, 28 Jan 2015 18:49:58 +0000 (18:49 +0000)]
Merge pull request #3648 from SpecLad:get_policy-ts
StevenPuttemans [Wed, 28 Jan 2015 12:52:50 +0000 (13:52 +0100)]
fixing tutorial errors
Alexander Karsakov [Thu, 13 Mar 2014 06:22:36 +0000 (10:22 +0400)]
Fixed getPolicy() method to make it thread-safe.
(cherry picked from commit
8910508b838363ce4f721e5b463cd04cfd225a1a)
Vadim Pisarevsky [Mon, 26 Jan 2015 09:45:59 +0000 (09:45 +0000)]
Merge pull request #3641 from cbenhagen:patch-2
Ben Hagen [Fri, 23 Jan 2015 11:59:09 +0000 (12:59 +0100)]
Do not blacklist GStreamer on Apple
Vadim Pisarevsky [Wed, 21 Jan 2015 10:40:19 +0000 (10:40 +0000)]
Merge pull request #3631 from StevenPuttemans:fix_samples
Vadim Pisarevsky [Tue, 20 Jan 2015 15:25:50 +0000 (15:25 +0000)]
Merge pull request #3468 from StevenPuttemans:fix_models
StevenPuttemans [Tue, 20 Jan 2015 14:41:39 +0000 (15:41 +0100)]
remove an unused #endif
Vadim Pisarevsky [Tue, 20 Jan 2015 12:36:38 +0000 (12:36 +0000)]
Merge pull request #3613 from asmorkalov:aarch64_tiff
Vadim Pisarevsky [Tue, 20 Jan 2015 12:34:49 +0000 (12:34 +0000)]
Merge pull request #3609 from jet47:fix-ocv_add_module-2.4
Vadim Pisarevsky [Mon, 19 Jan 2015 12:33:58 +0000 (12:33 +0000)]
Merge pull request #3621 from asmorkalov:ts_master_comapat_header
Vadim Pisarevsky [Mon, 19 Jan 2015 10:51:12 +0000 (10:51 +0000)]
Merge pull request #3623 from Trundle:fix_android_link
Vadim Pisarevsky [Mon, 19 Jan 2015 10:50:14 +0000 (10:50 +0000)]
Merge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2
Andreas Stührk [Sun, 18 Jan 2015 23:01:12 +0000 (00:01 +0100)]
Update link to information about Android platform.
The current link does no longer seem to work.
Alexander Smorkalov [Sun, 18 Jan 2015 18:27:47 +0000 (21:27 +0300)]
Added OpenCV 3.0 compat header for TS module.
Vadim Pisarevsky [Sun, 18 Jan 2015 18:22:27 +0000 (18:22 +0000)]
Merge pull request #3620 from asmorkalov:native_samples_install
Alexander Smorkalov [Sun, 18 Jan 2015 17:33:05 +0000 (20:33 +0300)]
Prevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.
Craig Reynolds [Fri, 16 Jan 2015 22:57:11 +0000 (14:57 -0800)]
In cvAddText, construct QString from "text" using fromUtf8.
Alexander Smorkalov [Fri, 16 Jan 2015 22:25:58 +0000 (01:25 +0300)]
TIFF support hack for aarch64 reverted.
Vadim Pisarevsky [Fri, 16 Jan 2015 10:23:32 +0000 (10:23 +0000)]
Merge pull request #3604 from asmorkalov:ocv_samples_package
Vladislav Vinogradov [Fri, 16 Jan 2015 07:59:52 +0000 (10:59 +0300)]
fix ocv_add_module CMake macro:
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
Alexander Smorkalov [Thu, 15 Jan 2015 12:36:45 +0000 (15:36 +0300)]
Fixed -samples debian package dependencies.
Alexander Smorkalov [Thu, 15 Jan 2015 11:48:24 +0000 (14:48 +0300)]
Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.
Alexander Smorkalov [Tue, 13 Jan 2015 11:39:56 +0000 (14:39 +0300)]
GPU samples with NVIDIA specific API excluded from build if CUDA disabled.
Alexander Smorkalov [Tue, 13 Jan 2015 10:22:41 +0000 (13:22 +0300)]
Build fixes for GPU samples.
Vadim Pisarevsky [Tue, 13 Jan 2015 11:25:32 +0000 (11:25 +0000)]
Merge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection
Alexander Smorkalov [Tue, 13 Jan 2015 10:00:06 +0000 (13:00 +0300)]
driver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do
Alexander Smorkalov [Mon, 5 Jan 2015 10:48:54 +0000 (13:48 +0300)]
parallel_do replaced with parallel_for_ in driver_gpu_multi sample.
Vadim Pisarevsky [Mon, 12 Jan 2015 11:29:21 +0000 (11:29 +0000)]
Merge pull request #3578 from asmorkalov:ocv_avx
Vijay Pradeep [Thu, 8 Jan 2015 23:26:15 +0000 (15:26 -0800)]
Fixing race condition by expanding resultsMutex lock section
Alexander Smorkalov [Tue, 30 Dec 2014 13:45:46 +0000 (16:45 +0300)]
OpenGL interop sample reworked not ot use cvconfig.h
Alexander Smorkalov [Tue, 30 Dec 2014 17:11:42 +0000 (20:11 +0300)]
More accurate AVX and AVX2 control.
- Previous version just checked option support, but not enable it.
- Also OpenCV tests reports invalid AVX and AVX2 support status.
Vadim Pisarevsky [Wed, 31 Dec 2014 09:17:25 +0000 (09:17 +0000)]
Merge pull request #3565 from mshabunin:ml-leak-24
Alexander Smorkalov [Tue, 30 Dec 2014 13:22:56 +0000 (16:22 +0300)]
parallel_do replaced by parallel_for_ in gpu/multi.cpp sample to get rid of cvconfig.h
Alexander Smorkalov [Tue, 30 Dec 2014 12:52:23 +0000 (15:52 +0300)]
Get rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework instead of direct TBB calls.
Maksim Shabunin [Tue, 30 Dec 2014 12:20:24 +0000 (15:20 +0300)]
Fixed memory leak in ML module
"int * CvMLData::sample_idx" was not freed
Vadim Pisarevsky [Tue, 30 Dec 2014 11:06:00 +0000 (11:06 +0000)]
Merge pull request #3562 from asmorkalov:ocv_aarch64
Alexander Smorkalov [Sun, 28 Dec 2014 09:44:24 +0000 (12:44 +0300)]
More accurate fix for libtiff and aarch64.
Alexander Smorkalov [Fri, 26 Dec 2014 10:08:44 +0000 (13:08 +0300)]
Full AARCH64 support with NEON and new CUDA toolkit.
Alexander Smorkalov [Fri, 26 Dec 2014 09:13:42 +0000 (12:13 +0300)]
TBB updated to 4.3u2. Fix for aarch64 support.
Alexander Smorkalov [Fri, 19 Dec 2014 16:05:53 +0000 (19:05 +0300)]
Fix of HaarCascade GPU test for aarch64.
Vadim Pisarevsky [Fri, 26 Dec 2014 14:34:13 +0000 (14:34 +0000)]
Merge pull request #3534 from taka-no-me:build_fixes
Vadim Pisarevsky [Fri, 26 Dec 2014 12:11:42 +0000 (12:11 +0000)]
Merge pull request #3543 from MatMoore:2.4
Vadim Pisarevsky [Fri, 26 Dec 2014 12:08:54 +0000 (12:08 +0000)]
Merge pull request #3545 from jet47:gpu-match-template-tests
Vladislav Vinogradov [Thu, 25 Dec 2014 14:43:13 +0000 (17:43 +0300)]
fix tests for gpu::matchTemplate:
use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values
Andrey Kamaev [Tue, 23 Dec 2014 08:08:07 +0000 (11:08 +0300)]
Fix Android build with the most resent android.toolchain.cmake
Andrey Kamaev [Sun, 21 Dec 2014 14:59:50 +0000 (17:59 +0300)]
Assorted fixes:
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
Roman Donchenko [Wed, 24 Dec 2014 09:01:40 +0000 (09:01 +0000)]
Merge pull request #3506 from doltac:typofix
Roman Donchenko [Wed, 24 Dec 2014 08:59:53 +0000 (08:59 +0000)]
Merge pull request #3497 from SpecLad:fs-open-fail-leak
Mat Moore [Tue, 23 Dec 2014 19:15:38 +0000 (19:15 +0000)]
Minor grammar improvements to documentation
Roman Donchenko [Mon, 22 Dec 2014 15:54:39 +0000 (18:54 +0300)]
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
... before any exceptions occur.
Vadim Pisarevsky [Mon, 22 Dec 2014 10:55:23 +0000 (10:55 +0000)]
Merge pull request #3471 from HelenWong:FixBug3714
Vadim Pisarevsky [Mon, 22 Dec 2014 10:54:57 +0000 (10:54 +0000)]
Merge pull request #3484 from euphrat:gmg_update_fix
Vadim Pisarevsky [Mon, 22 Dec 2014 10:41:20 +0000 (10:41 +0000)]
Merge pull request #3511 from mattip:2.4
Vadim Pisarevsky [Mon, 22 Dec 2014 10:38:55 +0000 (10:38 +0000)]
Merge pull request #3514 from mshabunin:compat-24
Vadim Pisarevsky [Mon, 22 Dec 2014 10:28:33 +0000 (10:28 +0000)]
Merge pull request #3500 from StevenPuttemans:fix_2432_2.4