Andrey Pavlenko [Fri, 28 Mar 2014 19:17:07 +0000 (23:17 +0400)]
Merge pull request #2543 from apavlenko:24_haar_revert
Roman Donchenko [Fri, 28 Mar 2014 15:37:03 +0000 (19:37 +0400)]
Merge pull request #2534 from asmorkalov:opencv_config_cut_cuda_abs_path
Alexander Smorkalov [Wed, 26 Mar 2014 19:26:21 +0000 (23:26 +0400)]
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
Andrey Pavlenko [Fri, 28 Mar 2014 12:08:11 +0000 (16:08 +0400)]
Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"
This reverts commit
3dcddad88aa13b729313939648c29f420a9f8054.
Conflicts:
modules/ocl/src/opencl/haarobjectdetect.cl
Andrey Pavlenko [Fri, 28 Mar 2014 12:06:39 +0000 (16:06 +0400)]
- fix test
Andrey Pavlenko [Fri, 28 Mar 2014 12:05:04 +0000 (16:05 +0400)]
Revert "Merge pull request #1779 from perping:integral_2.4"
This reverts commit
54ea5bbac77a9dbd10f314ee1ee2b10e3b6c44fa, reversing
changes made to
28e0d3d771d9db9d03ea55f8d0504558e17139b2.
Roman Donchenko [Fri, 28 Mar 2014 08:45:39 +0000 (12:45 +0400)]
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
Roman Donchenko [Fri, 28 Mar 2014 07:58:23 +0000 (11:58 +0400)]
Merge pull request #2539 from mjul:fixtypos
Roman Donchenko [Fri, 28 Mar 2014 07:58:11 +0000 (11:58 +0400)]
Merge pull request #2540 from mjul:fixtypos_2.4
Alexander Smorkalov [Fri, 28 Mar 2014 00:56:31 +0000 (04:56 +0400)]
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
Roman Donchenko [Thu, 27 Mar 2014 13:43:02 +0000 (17:43 +0400)]
Merge pull request #2537 from ilya-lavrenov:doc_fix
Martin Jul [Thu, 27 Mar 2014 12:52:49 +0000 (13:52 +0100)]
Fixed typo in BFMatcher in docs.
Ilya Lavrenov [Thu, 27 Mar 2014 12:30:29 +0000 (16:30 +0400)]
doc fix
Martin Jul [Thu, 27 Mar 2014 12:20:48 +0000 (13:20 +0100)]
Merge branch '2.4' into fixtypos
Martin Jul [Wed, 26 Mar 2014 22:29:48 +0000 (23:29 +0100)]
Fixed typos in "matching"
Andrey Pavlenko [Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)]
Merge pull request #2527 from apavlenko:ocl_surf_24
Andrey Pavlenko [Tue, 25 Mar 2014 12:19:45 +0000 (16:19 +0400)]
splitting plain and OCL tests for SURF.
Roman Donchenko [Wed, 26 Mar 2014 08:18:39 +0000 (12:18 +0400)]
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
Andrey Pavlenko [Tue, 25 Mar 2014 10:09:49 +0000 (14:09 +0400)]
disabling calls to SURF_OCL causing tests failures
Andrey Pavlenko [Tue, 25 Mar 2014 09:16:42 +0000 (13:16 +0400)]
fixing conditional compilation
Andrey Pavlenko [Tue, 25 Mar 2014 09:15:56 +0000 (13:15 +0400)]
fixing check_docs2.py issue
Roman Donchenko [Tue, 25 Mar 2014 08:14:44 +0000 (12:14 +0400)]
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
Roman Donchenko [Mon, 24 Mar 2014 14:54:00 +0000 (18:54 +0400)]
Merge pull request #2521 from atrebbi:#3620
Roman Donchenko [Mon, 24 Mar 2014 14:52:49 +0000 (18:52 +0400)]
Merge pull request #2516 from Daniil-Osokin:fix_docs
Daniil Osokin [Mon, 24 Mar 2014 09:02:22 +0000 (13:02 +0400)]
Removed obsolete list from docs
Roman Donchenko [Mon, 24 Mar 2014 10:05:17 +0000 (14:05 +0400)]
Merge pull request #2520 from vlkolesnikov:misprint_fix
Daniil Osokin [Fri, 21 Mar 2014 16:32:14 +0000 (20:32 +0400)]
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
Roman Donchenko [Mon, 24 Mar 2014 08:26:57 +0000 (12:26 +0400)]
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
Roman Donchenko [Mon, 24 Mar 2014 08:06:50 +0000 (12:06 +0400)]
Merge pull request #2504 from asmorkalov:android_camera_locks_24
Roman Donchenko [Mon, 24 Mar 2014 08:03:26 +0000 (12:03 +0400)]
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
Vladimir Kolesnikov [Mon, 24 Mar 2014 07:04:49 +0000 (11:04 +0400)]
Misprint fixed in table formatter
Andrey Pavlenko [Mon, 24 Mar 2014 06:25:47 +0000 (10:25 +0400)]
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
Andrey Pavlenko [Mon, 24 Mar 2014 06:25:03 +0000 (10:25 +0400)]
Merge pull request #2517 from ilya-lavrenov:fix
Andrey Pavlenko [Mon, 24 Mar 2014 06:12:02 +0000 (10:12 +0400)]
disabling failing tests
Andrey Pavlenko [Mon, 24 Mar 2014 06:08:44 +0000 (10:08 +0400)]
making OCL tests conform to the comon style
Alessandro Trebbi [Sun, 23 Mar 2014 21:00:16 +0000 (22:00 +0100)]
-
Ilya Lavrenov [Sun, 23 Mar 2014 12:20:00 +0000 (16:20 +0400)]
doc fix
Alexander Smorkalov [Fri, 21 Mar 2014 14:20:57 +0000 (18:20 +0400)]
Added guard to prevent from gpu module redefinition in OpenCV.mk
Kang Liu [Fri, 21 Mar 2014 21:28:48 +0000 (22:28 +0100)]
Keep definitions of link aliases consistent
Daniil Osokin [Fri, 21 Mar 2014 15:28:42 +0000 (19:28 +0400)]
Fixed Load, Modify, and Save an Image tutorial
Andrey Pavlenko [Fri, 21 Mar 2014 14:45:58 +0000 (18:45 +0400)]
Merge pull request #2454 from apavlenko:2.4_haar_extend
Alexander Smorkalov [Fri, 21 Mar 2014 13:58:59 +0000 (17:58 +0400)]
Implicit linkage with CUDA runtime reverted.
Alexander Smorkalov [Wed, 19 Feb 2014 12:20:40 +0000 (16:20 +0400)]
Multiple fixes in camera.
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
Roman Donchenko [Fri, 21 Mar 2014 12:28:47 +0000 (16:28 +0400)]
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
Roman Donchenko [Fri, 21 Mar 2014 12:00:29 +0000 (16:00 +0400)]
Merge pull request #2510 from asmorkalov:android_cuda_filter_fix
Kang Liu [Fri, 21 Mar 2014 10:54:35 +0000 (11:54 +0100)]
remove highlighting in some function links
1. Remove whole-document highlighting in some function links
2. fix the function alias `readwriteimagevideo`
Andrey Pavlenko [Fri, 21 Mar 2014 10:30:49 +0000 (14:30 +0400)]
adding missing include (fixing 'no ocl implementation' error)
Alexander Smorkalov [Wed, 19 Feb 2014 12:20:40 +0000 (16:20 +0400)]
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
Roman Donchenko [Fri, 21 Mar 2014 09:58:05 +0000 (13:58 +0400)]
Merge pull request #2400 from RJ2:Bugfix_2
Roman Donchenko [Fri, 21 Mar 2014 09:54:51 +0000 (13:54 +0400)]
Merge pull request #2423 from RJ2:bugfix_5
Alexander Smorkalov [Fri, 21 Mar 2014 08:48:38 +0000 (12:48 +0400)]
Libraries filter update after abs path cut.
Andrey Pavlenko [Thu, 20 Mar 2014 18:22:55 +0000 (22:22 +0400)]
switching to CV_HAAR_SCALE_IMAGE mode, enabling test
Roman Donchenko [Thu, 20 Mar 2014 13:49:41 +0000 (17:49 +0400)]
Merge pull request #2449 from asmorkalov:cuda_abs_path_fix
Andrey Pavlenko [Thu, 20 Mar 2014 09:54:26 +0000 (13:54 +0400)]
Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters
Roman Donchenko [Thu, 20 Mar 2014 08:40:23 +0000 (12:40 +0400)]
Merge pull request #2473 from euphrat:mog2_weight_bugfix
Alexander Smorkalov [Fri, 28 Feb 2014 14:18:20 +0000 (18:18 +0400)]
Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.
Kang Liu [Wed, 19 Mar 2014 12:05:38 +0000 (13:05 +0100)]
1. fix an error in sample code
2. change an external link to maintain consistency with the previous tutorial
Roman Donchenko [Wed, 19 Mar 2014 10:49:21 +0000 (14:49 +0400)]
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
Firat Kalaycilar [Tue, 18 Mar 2014 15:26:24 +0000 (17:26 +0200)]
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in the CUDA and OCL versions of BackgroundSubtractorMOG2
Alexander Smorkalov [Wed, 5 Mar 2014 08:31:04 +0000 (12:31 +0400)]
Superres module enabled for Android. GPU samples build fixed for Android.
Firat Kalaycilar [Tue, 18 Mar 2014 12:00:30 +0000 (14:00 +0200)]
Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix
Roman Donchenko [Tue, 18 Mar 2014 11:41:20 +0000 (15:41 +0400)]
Merge pull request #2488 from Nerei:minor_doc
Roman Donchenko [Tue, 18 Mar 2014 10:39:40 +0000 (14:39 +0400)]
Merge pull request #2456 from kurodash:pr_use_cvAlloc
Roman Donchenko [Tue, 18 Mar 2014 09:40:43 +0000 (13:40 +0400)]
Merge pull request #2026 from pemmanuelviel:giveFurthestPoint
RJ2 [Tue, 18 Mar 2014 07:59:53 +0000 (08:59 +0100)]
I have changed one sentence in tutorial, making it more understandable
RJ2 [Tue, 18 Mar 2014 07:01:18 +0000 (08:01 +0100)]
It's will be better
Ilya Lavrenov [Mon, 17 Mar 2014 14:52:28 +0000 (18:52 +0400)]
remove intel guard since the code is 2 times faster on AMD too
yash [Mon, 24 Feb 2014 12:58:55 +0000 (18:28 +0530)]
made the example consistent with the fuction definition and improved doc
made the example consistent with the fuction definition and improved doc
Anatoly Baksheev [Mon, 17 Mar 2014 13:02:49 +0000 (17:02 +0400)]
minor doc fix
Roman Donchenko [Mon, 17 Mar 2014 11:52:56 +0000 (15:52 +0400)]
Merge pull request #2460 from berak:b_3598_24
Roman Donchenko [Mon, 17 Mar 2014 10:43:15 +0000 (14:43 +0400)]
Merge pull request #2458 from asmorkalov:android_cmake_opencv_modules_suffix
Alexander Smorkalov [Wed, 5 Mar 2014 05:57:16 +0000 (09:57 +0400)]
OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations.
berak [Thu, 13 Mar 2014 07:39:15 +0000 (08:39 +0100)]
fixed h / s ranges in histogram_calculation tutorial
literalinclude
literalinclude, dropped :lines:
Roman Donchenko [Mon, 17 Mar 2014 07:59:14 +0000 (11:59 +0400)]
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
Roman Donchenko [Mon, 17 Mar 2014 07:57:09 +0000 (11:57 +0400)]
Merge pull request #2484 from berak:mat_doc_24
Anatoly Baksheev [Sun, 16 Mar 2014 16:07:05 +0000 (20:07 +0400)]
Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)
berak [Sun, 16 Mar 2014 13:04:05 +0000 (14:04 +0100)]
missing () on Mat::type()
Andrey Pavlenko [Fri, 14 Mar 2014 15:05:55 +0000 (19:05 +0400)]
Merge pull request #2475 from ilya-lavrenov:ocl_2.4_fix
kuroda sho [Fri, 14 Mar 2014 08:02:20 +0000 (17:02 +0900)]
fix: use "cvAlloc" wrapper function for malloc.
Ilya Lavrenov [Thu, 13 Mar 2014 18:56:46 +0000 (22:56 +0400)]
typos
Ilya Lavrenov [Thu, 13 Mar 2014 18:35:08 +0000 (22:35 +0400)]
nonfree perf tests
Ilya Lavrenov [Thu, 13 Mar 2014 15:42:13 +0000 (19:42 +0400)]
improved performance of bitwise ops
Ilya Lavrenov [Thu, 13 Mar 2014 12:27:07 +0000 (16:27 +0400)]
improved performance of cv::ocl::sum
Ilya Lavrenov [Thu, 13 Mar 2014 11:35:53 +0000 (15:35 +0400)]
improved performance of cv::ocl::countNonZero
Ilya Lavrenov [Thu, 13 Mar 2014 10:57:13 +0000 (14:57 +0400)]
changes for GFTT
Ilya Lavrenov [Wed, 12 Mar 2014 15:58:53 +0000 (19:58 +0400)]
improved performance of cv::ocl::minMax
Firat Kalaycilar [Wed, 12 Mar 2014 14:14:59 +0000 (16:14 +0200)]
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in BackgroundSubtractorMOG2
Roman Donchenko [Wed, 12 Mar 2014 12:53:41 +0000 (16:53 +0400)]
Merge pull request #2434 from Nerei:viz_continue
Anatoly Baksheev [Wed, 12 Mar 2014 12:21:36 +0000 (16:21 +0400)]
minor cmake fix fo macos
Roman Donchenko [Tue, 11 Mar 2014 13:41:18 +0000 (17:41 +0400)]
Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo
Andrey Pavlenko [Tue, 11 Mar 2014 08:57:28 +0000 (12:57 +0400)]
Merge pull request #2448 from akarsakov:ocl_cxt_termination
Andrey Pavlenko [Tue, 11 Mar 2014 08:37:11 +0000 (12:37 +0400)]
Merge pull request #2457 from ilya-lavrenov:ocl_calc_hist
Ilya Lavrenov [Fri, 7 Mar 2014 10:35:51 +0000 (14:35 +0400)]
added performance tests for cv::ocl::calcHist
Ian Taylor [Mon, 10 Mar 2014 07:02:06 +0000 (03:02 -0400)]
fix variable name typo in calcBlurriness
kurodash [Fri, 7 Mar 2014 10:02:37 +0000 (19:02 +0900)]
fix: use "cvAlloc" wrapper function for malloc.
Andrey Pavlenko [Thu, 6 Mar 2014 18:03:01 +0000 (22:03 +0400)]
Merge pull request #2445 from ilya-lavrenov:ocl_perf
Roman Donchenko [Thu, 6 Mar 2014 13:53:31 +0000 (17:53 +0400)]
Merge pull request #2443 from waveform80:issue-3554
Alexander Karsakov [Thu, 6 Mar 2014 07:16:38 +0000 (11:16 +0400)]
Clarifying comments
Alexander Smorkalov [Wed, 5 Mar 2014 07:25:27 +0000 (11:25 +0400)]
Implicit CUDA and OpenCL control for module definition added.
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
Ilya Lavrenov [Thu, 6 Mar 2014 05:24:02 +0000 (09:24 +0400)]
tuned some tests