platform/upstream/opencv.git
9 years agoFix setting of architecture for MinGW builds
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.

9 years agoFix MinGW detection on x86
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.

9 years agoMerge pull request #3721 from nitsch:fix-cmake-current-list-dir
Alexander Smorkalov [Sat, 21 Feb 2015 16:49:36 +0000 (16:49 +0000)]
Merge pull request #3721 from nitsch:fix-cmake-current-list-dir

9 years agoMerge pull request #3708 from StevenPuttemans:fix_traincascade_load_message
Alexander Smorkalov [Sat, 21 Feb 2015 16:47:58 +0000 (16:47 +0000)]
Merge pull request #3708 from StevenPuttemans:fix_traincascade_load_message

9 years agoMerge pull request #3732 from StevenPuttemans:fix_4004_2.4
Alexander Smorkalov [Sat, 21 Feb 2015 16:46:41 +0000 (16:46 +0000)]
Merge pull request #3732 from StevenPuttemans:fix_4004_2.4

9 years agoExclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR
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.

9 years agoMerge pull request #3726 from asmorkalov:ocv_version_inc4
Andrey Pavlenko [Fri, 20 Feb 2015 16:11:58 +0000 (16:11 +0000)]
Merge pull request #3726 from asmorkalov:ocv_version_inc4

9 years agoadd remarks for iOS tutorial
StevenPuttemans [Fri, 20 Feb 2015 13:25:14 +0000 (14:25 +0100)]
add remarks for iOS tutorial

9 years agoMerge pull request #3710 from asmorkalov:aarc64_manager_android_5
Vadim Pisarevsky [Fri, 20 Feb 2015 13:02:07 +0000 (13:02 +0000)]
Merge pull request #3710 from asmorkalov:aarc64_manager_android_5

9 years agoMerge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
Vadim Pisarevsky [Fri, 20 Feb 2015 12:32:35 +0000 (12:32 +0000)]
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac

9 years agoMerge pull request #3723 from SpecLad:run-all-tests-windows
Vadim Pisarevsky [Fri, 20 Feb 2015 12:28:15 +0000 (12:28 +0000)]
Merge pull request #3723 from SpecLad:run-all-tests-windows

9 years agoMerge pull request #3704 from SpecLad:win-install-data
Vadim Pisarevsky [Fri, 20 Feb 2015 12:27:34 +0000 (12:27 +0000)]
Merge pull request #3704 from SpecLad:win-install-data

9 years agoMerge pull request #3707 from alalek:fix_android_camera
Vadim Pisarevsky [Fri, 20 Feb 2015 12:27:13 +0000 (12:27 +0000)]
Merge pull request #3707 from alalek:fix_android_camera

9 years agoOpenCV and OpenCV Manager version++
Alexander Smorkalov [Fri, 20 Feb 2015 10:46:54 +0000 (13:46 +0300)]
OpenCV and OpenCV Manager version++

9 years agoBuild fix for case without TegraDetector.
Alexander Smorkalov [Fri, 20 Feb 2015 10:29:58 +0000 (13:29 +0300)]
Build fix for case without TegraDetector.

9 years agoAndroid 5 support and aarch64-related fixes for Android Manager.
Alexander Smorkalov [Tue, 17 Feb 2015 13:54:05 +0000 (16:54 +0300)]
Android 5 support and aarch64-related fixes for Android Manager.

9 years agoAdd a script to run all tests on Windows
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.

9 years agoImplement CMAKE_CURRENT_LIST_DIR for older CMake
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.

9 years agoMerge pull request #3705 from SpecLad:unused-nNull
Vadim Pisarevsky [Thu, 19 Feb 2015 18:40:22 +0000 (18:40 +0000)]
Merge pull request #3705 from SpecLad:unused-nNull

9 years agoMerge pull request #3683 from SeninAndrew:2.4
Alexander Alekhin [Wed, 18 Feb 2015 17:15:10 +0000 (17:15 +0000)]
Merge pull request #3683 from SeninAndrew:2.4

9 years agoMerge pull request #3699 from SpecLad:rm-component-install
Vadim Pisarevsky [Wed, 18 Feb 2015 13:55:06 +0000 (13:55 +0000)]
Merge pull request #3699 from SpecLad:rm-component-install

9 years agoMerge pull request #3663 from eliteraspberries:ffmpeg-dylib
Vadim Pisarevsky [Wed, 18 Feb 2015 12:50:09 +0000 (12:50 +0000)]
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib

9 years agoMerge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
Vijay Pradeep [Tue, 17 Feb 2015 18:16:44 +0000 (10:16 -0800)]
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac

9 years agoRemoving rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
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

9 years agofix message of preloaded parameters
StevenPuttemans [Tue, 17 Feb 2015 09:21:31 +0000 (10:21 +0100)]
fix message of preloaded parameters

9 years agoAndroid: fix JavaCameraView implementation
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)

9 years agocap_msmf.hpp: fix a warning about nNull being unused
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.

9 years agoInstall data and test data on Windows
Roman Donchenko [Mon, 16 Feb 2015 16:24:07 +0000 (19:24 +0300)]
Install data and test data on Windows

Because why not?

9 years agoMerge pull request #3698 from SpecLad:avcodec-free-frame
Vadim Pisarevsky [Mon, 16 Feb 2015 11:33:00 +0000 (11:33 +0000)]
Merge pull request #3698 from SpecLad:avcodec-free-frame

9 years agoMerge pull request #3697 from tomi44g:2.4
Vadim Pisarevsky [Mon, 16 Feb 2015 11:28:02 +0000 (11:28 +0000)]
Merge pull request #3697 from tomi44g:2.4

9 years agoMerge pull request #3695 from SpecLad:fix-hdc-tautology
Roman Donchenko [Fri, 13 Feb 2015 14:09:07 +0000 (14:09 +0000)]
Merge pull request #3695 from SpecLad:fix-hdc-tautology

9 years agoMerge pull request #3693 from SpecLad:no-absolute-destinations
Roman Donchenko [Fri, 13 Feb 2015 14:06:54 +0000 (14:06 +0000)]
Merge pull request #3693 from SpecLad:no-absolute-destinations

9 years agoRemove useless CPACK_*_COMPONENT_INSTALL variables
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.

9 years agoFix a memory leak in CvCapture_FFMPEG::close
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.

9 years agoFix iOS warnings about implicit conversion precision by changing double literals...
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

9 years agoDon't install documentation if it isn't built
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.

9 years agoDon't use ${CMAKE_INSTALL_PREFIX} as an install destination
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.

9 years agoMerge pull request #3689 from jet47:test-script-optional-color-2.4
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

9 years agomake color output in run_test script optional
Vladislav Vinogradov [Mon, 9 Feb 2015 12:23:34 +0000 (15:23 +0300)]
make color output in run_test script optional

9 years agoFixing XIMEA parameters mapping (issue #4176)
Andrew Senin [Fri, 6 Feb 2015 21:48:37 +0000 (00:48 +0300)]
Fixing XIMEA parameters mapping (issue #4176)

9 years agoMerge pull request #3680 from jet47:fix-run-tests-script-2.4
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

9 years agofix opencv_run_all_tests_unix.sh script:
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

9 years agoMerge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix
Vadim Pisarevsky [Thu, 5 Feb 2015 07:48:43 +0000 (07:48 +0000)]
Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix

9 years agoMerge pull request #3674 from jet47:colorize-run-test-script-2.4
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

9 years agoAdd back the version variables removed in ab40630f.
Mansour Moufid [Wed, 4 Feb 2015 15:55:38 +0000 (10:55 -0500)]
Add back the version variables removed in ab40630f.

9 years agoMerge pull request #3676 from asmorkalov:changelog_for_tests
Vadim Pisarevsky [Wed, 4 Feb 2015 15:13:44 +0000 (15:13 +0000)]
Merge pull request #3676 from asmorkalov:changelog_for_tests

9 years agoAdded Debian changelog to -tests package.
Alexander Smorkalov [Wed, 4 Feb 2015 13:52:39 +0000 (16:52 +0300)]
Added Debian changelog to -tests package.

9 years agoMerge pull request #3672 from asmorkalov:debian_lower_case
Vadim Pisarevsky [Wed, 4 Feb 2015 13:17:51 +0000 (13:17 +0000)]
Merge pull request #3672 from asmorkalov:debian_lower_case

9 years agoMerge pull request #3671 from jet47:disable-gpu-match-template-tests
Vadim Pisarevsky [Wed, 4 Feb 2015 13:17:25 +0000 (13:17 +0000)]
Merge pull request #3671 from jet47:disable-gpu-match-template-tests

9 years agocolorize opencv_run_all_tests_unix.sh script output
Vladislav Vinogradov [Wed, 4 Feb 2015 09:38:51 +0000 (12:38 +0300)]
colorize opencv_run_all_tests_unix.sh script output

9 years agoDebian package names replaced by lower case version to satisfy lintian.
Alexander Smorkalov [Wed, 4 Feb 2015 08:37:52 +0000 (11:37 +0300)]
Debian package names replaced by lower case version to satisfy lintian.

9 years agodisable gpu::matchTemplate tests
Vladislav Vinogradov [Wed, 4 Feb 2015 08:21:17 +0000 (11:21 +0300)]
disable gpu::matchTemplate tests

9 years agoFix indentation of 98a157f5.
Mansour Moufid [Wed, 4 Feb 2015 04:17:43 +0000 (23:17 -0500)]
Fix indentation of 98a157f5.

9 years agoRemove Apple-specific logic in finding the FFmpeg libraries.
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.

9 years agoCorrect the new find_library commands.
Mansour Moufid [Mon, 2 Feb 2015 16:54:09 +0000 (11:54 -0500)]
Correct the new find_library commands.

Thanks to SpecLad.

9 years agoModified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated...
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)

9 years agoMerge pull request #3662 from StevenPuttemans:fix_models
Vadim Pisarevsky [Mon, 2 Feb 2015 10:17:43 +0000 (10:17 +0000)]
Merge pull request #3662 from StevenPuttemans:fix_models

9 years agoUse the CMake find_library command to find the FFmpeg libraries.
Mansour Moufid [Sun, 1 Feb 2015 20:51:33 +0000 (15:51 -0500)]
Use the CMake find_library command to find the FFmpeg libraries.

9 years agofixing wrong model sizes
StevenPuttemans [Sun, 1 Feb 2015 14:13:57 +0000 (15:13 +0100)]
fixing wrong model sizes

9 years agoMerge pull request #3660 from asmorkalov:samples_install_permissions
Vadim Pisarevsky [Sun, 1 Feb 2015 09:14:28 +0000 (09:14 +0000)]
Merge pull request #3660 from asmorkalov:samples_install_permissions

9 years agoFixed samples install permissions for Debian packaging.
Alexander Smorkalov [Sat, 31 Jan 2015 21:34:23 +0000 (00:34 +0300)]
Fixed samples install permissions for Debian packaging.

9 years agoMerge pull request #3655 from asmorkalov:remove_opencv_testing_sh
Vadim Pisarevsky [Sat, 31 Jan 2015 14:46:40 +0000 (14:46 +0000)]
Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh

9 years agoMerge pull request #3658 from asmorkalov:numpy_dependency
Vadim Pisarevsky [Sat, 31 Jan 2015 14:45:11 +0000 (14:45 +0000)]
Merge pull request #3658 from asmorkalov:numpy_dependency

9 years agoMerge pull request #3659 from asmorkalov:debian_changelog_stub
Vadim Pisarevsky [Sat, 31 Jan 2015 14:44:41 +0000 (14:44 +0000)]
Merge pull request #3659 from asmorkalov:debian_changelog_stub

9 years agoAdded Debian changelog installation step for Debian package generation.
Alexander Smorkalov [Fri, 30 Jan 2015 10:21:52 +0000 (13:21 +0300)]
Added Debian changelog installation step for Debian package generation.

9 years agoAdded dependency from numpy to debian package with python bindings.
Alexander Smorkalov [Fri, 30 Jan 2015 09:26:08 +0000 (12:26 +0300)]
Added dependency from numpy to debian package with python bindings.

9 years agoopencv_testing.sh script installation is removed as run tests script does the same...
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.

9 years agoMerge pull request #3649 from StevenPuttemans:fix_tutorials
Vadim Pisarevsky [Thu, 29 Jan 2015 12:14:09 +0000 (12:14 +0000)]
Merge pull request #3649 from StevenPuttemans:fix_tutorials

9 years agoMerge pull request #3587 from vpradeep07:fix/pnpransac_race_cond
Vadim Pisarevsky [Thu, 29 Jan 2015 12:12:18 +0000 (12:12 +0000)]
Merge pull request #3587 from vpradeep07:fix/pnpransac_race_cond

9 years agoMerge pull request #3648 from SpecLad:get_policy-ts
Vadim Pisarevsky [Wed, 28 Jan 2015 18:49:58 +0000 (18:49 +0000)]
Merge pull request #3648 from SpecLad:get_policy-ts

9 years agofixing tutorial errors
StevenPuttemans [Wed, 28 Jan 2015 12:52:50 +0000 (13:52 +0100)]
fixing tutorial errors

9 years agoFixed getPolicy() method to make it thread-safe.
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)

9 years agoMerge pull request #3641 from cbenhagen:patch-2
Vadim Pisarevsky [Mon, 26 Jan 2015 09:45:59 +0000 (09:45 +0000)]
Merge pull request #3641 from cbenhagen:patch-2

9 years agoDo not blacklist GStreamer on Apple
Ben Hagen [Fri, 23 Jan 2015 11:59:09 +0000 (12:59 +0100)]
Do not blacklist GStreamer on Apple

9 years agoMerge pull request #3631 from StevenPuttemans:fix_samples
Vadim Pisarevsky [Wed, 21 Jan 2015 10:40:19 +0000 (10:40 +0000)]
Merge pull request #3631 from StevenPuttemans:fix_samples

9 years agoMerge pull request #3468 from StevenPuttemans:fix_models
Vadim Pisarevsky [Tue, 20 Jan 2015 15:25:50 +0000 (15:25 +0000)]
Merge pull request #3468 from StevenPuttemans:fix_models

9 years agoremove an unused #endif
StevenPuttemans [Tue, 20 Jan 2015 14:41:39 +0000 (15:41 +0100)]
remove an unused #endif

9 years agoMerge pull request #3613 from asmorkalov:aarch64_tiff
Vadim Pisarevsky [Tue, 20 Jan 2015 12:36:38 +0000 (12:36 +0000)]
Merge pull request #3613 from asmorkalov:aarch64_tiff

9 years agoMerge pull request #3609 from jet47:fix-ocv_add_module-2.4
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

9 years agoMerge pull request #3621 from asmorkalov:ts_master_comapat_header
Vadim Pisarevsky [Mon, 19 Jan 2015 12:33:58 +0000 (12:33 +0000)]
Merge pull request #3621 from asmorkalov:ts_master_comapat_header

9 years agoMerge pull request #3623 from Trundle:fix_android_link
Vadim Pisarevsky [Mon, 19 Jan 2015 10:51:12 +0000 (10:51 +0000)]
Merge pull request #3623 from Trundle:fix_android_link

9 years agoMerge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2
Vadim Pisarevsky [Mon, 19 Jan 2015 10:50:14 +0000 (10:50 +0000)]
Merge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2

9 years agoUpdate link to information about Android platform.
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.

9 years agoAdded OpenCV 3.0 compat header for TS module.
Alexander Smorkalov [Sun, 18 Jan 2015 18:27:47 +0000 (21:27 +0300)]
Added OpenCV 3.0 compat header for TS module.

9 years agoMerge pull request #3620 from asmorkalov:native_samples_install
Vadim Pisarevsky [Sun, 18 Jan 2015 18:22:27 +0000 (18:22 +0000)]
Merge pull request #3620 from asmorkalov:native_samples_install

9 years agoPrevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.
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.

9 years agoIn cvAddText, construct QString from "text" using fromUtf8.
Craig Reynolds [Fri, 16 Jan 2015 22:57:11 +0000 (14:57 -0800)]
In cvAddText, construct QString from "text" using fromUtf8.

9 years agoTIFF support hack for aarch64 reverted.
Alexander Smorkalov [Fri, 16 Jan 2015 22:25:58 +0000 (01:25 +0300)]
TIFF support hack for aarch64 reverted.

9 years agoMerge pull request #3604 from asmorkalov:ocv_samples_package
Vadim Pisarevsky [Fri, 16 Jan 2015 10:23:32 +0000 (10:23 +0000)]
Merge pull request #3604 from asmorkalov:ocv_samples_package

9 years agofix ocv_add_module CMake macro:
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

9 years agoFixed -samples debian package dependencies.
Alexander Smorkalov [Thu, 15 Jan 2015 12:36:45 +0000 (15:36 +0300)]
Fixed -samples debian package dependencies.

9 years agoFixed installation of CMakeLists.txt and enabled GPU samples build in stand alone...
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.

9 years agoNow using default arg instead of overloads
Vijay Pradeep [Tue, 13 Jan 2015 19:25:01 +0000 (11:25 -0800)]
Now using default arg instead of overloads

9 years agoGPU samples with NVIDIA specific API excluded from build if CUDA disabled.
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.

9 years agoBuild fixes for GPU samples.
Alexander Smorkalov [Tue, 13 Jan 2015 10:22:41 +0000 (13:22 +0300)]
Build fixes for GPU samples.

9 years agoMerge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection
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

9 years agodriver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do
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

9 years agoparallel_do replaced with parallel_for_ in driver_gpu_multi sample.
Alexander Smorkalov [Mon, 5 Jan 2015 10:48:54 +0000 (13:48 +0300)]
parallel_do replaced with parallel_for_ in driver_gpu_multi sample.

9 years agoMerge pull request #3578 from asmorkalov:ocv_avx
Vadim Pisarevsky [Mon, 12 Jan 2015 11:29:21 +0000 (11:29 +0000)]
Merge pull request #3578 from asmorkalov:ocv_avx

9 years agoWhitespace fix
Vijay Pradeep [Fri, 9 Jan 2015 18:44:19 +0000 (10:44 -0800)]
Whitespace fix