Kevron Rees [Mon, 29 Sep 2014 21:49:43 +0000 (14:49 -0700)]
use floor smack manifest
Change-Id: I699a07cd0cbbcba4df25ff3ee87750cfbef5bd74
Kevron Rees [Fri, 9 May 2014 21:15:23 +0000 (14:15 -0700)]
updated to 2.4.9
Kevron Rees [Fri, 9 May 2014 16:15:47 +0000 (09:15 -0700)]
Merge branch 'up2.4.9' into tizen
Mikko Ylinen [Mon, 28 Apr 2014 07:57:05 +0000 (10:57 +0300)]
Disable WITH_OPENGL and remove BuildRequires to GLU
WITH_OPENGL option is only relevant if GUI build options
are enabled. GUI build options disabled in Tizen so WITH_OPEN=ON
and BuildRequires to GLU create an unnecessary dependency.
Change-Id: Ibbf21977191695a94880160b4baa6e8e8b9f9e84
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
Roman Donchenko [Fri, 11 Apr 2014 10:15:26 +0000 (14:15 +0400)]
Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos
Roman Donchenko [Fri, 11 Apr 2014 10:14:33 +0000 (14:14 +0400)]
Merge pull request #2579 from maksqwe:test_operations_fix
Roman Donchenko [Fri, 11 Apr 2014 10:14:04 +0000 (14:14 +0400)]
Merge pull request #2603 from maksqwe:unused_fix_2.4
Vadim Pisarevsky [Thu, 10 Apr 2014 09:31:33 +0000 (13:31 +0400)]
Merge pull request #2575 from rold2007:Bugfix_1437
Vadim Pisarevsky [Thu, 10 Apr 2014 09:30:36 +0000 (13:30 +0400)]
Merge pull request #2599 from maksqwe:test_calibration_2.4
Vadim Pisarevsky [Thu, 10 Apr 2014 09:29:58 +0000 (13:29 +0400)]
Merge pull request #2591 from Nerei:viz_cloud_shading_support
Maks Naumov [Wed, 9 Apr 2014 20:07:48 +0000 (23:07 +0300)]
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()
Maks Naumov [Wed, 9 Apr 2014 20:06:06 +0000 (23:06 +0300)]
remove unused variable in TEST_P()
Maks Naumov [Wed, 9 Apr 2014 20:04:29 +0000 (23:04 +0300)]
remove unused variable in OCL_PERF_TEST_P()
Maks Naumov [Wed, 9 Apr 2014 20:01:49 +0000 (23:01 +0300)]
remove unused variable in ocl_moments()
Maks Naumov [Wed, 9 Apr 2014 19:59:52 +0000 (22:59 +0300)]
remove unused variable in findCorners_caller()
Maks Naumov [Wed, 9 Apr 2014 19:56:19 +0000 (22:56 +0300)]
remove unused variable in HOGDescriptor::groupRectangles()
Maks Naumov [Wed, 9 Apr 2014 19:53:36 +0000 (22:53 +0300)]
remove unused variable in loadFromXML()
Maks Naumov [Wed, 9 Apr 2014 19:48:19 +0000 (22:48 +0300)]
Merge pull request #1 from Itseez/2.4
2.4
Maks Naumov [Wed, 9 Apr 2014 11:41:16 +0000 (14:41 +0300)]
fix typo in test_cameracalibration
David Rolland [Sun, 6 Apr 2014 09:32:01 +0000 (21:32 +1200)]
Corrected bug #1437. Corrected the cast of two short values from an lParam. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.)
The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx.
Anatoly Baksheev [Tue, 8 Apr 2014 16:26:56 +0000 (20:26 +0400)]
Added cloud shading support - additional normals array is used
Martin Chodakowski [Thu, 3 Apr 2014 21:07:05 +0000 (17:07 -0400)]
Fix typos in old python wrapper documentation(Bug #3628)
Fixed spelling of CV_INTER_LINEAR flag in geometric_transformations.rst
Maks Naumov [Mon, 7 Apr 2014 08:24:27 +0000 (11:24 +0300)]
fix condition in CV_OperationsTest::operations1()
Roman Donchenko [Mon, 7 Apr 2014 07:57:52 +0000 (11:57 +0400)]
Merge pull request #2572 from jet47:gpu-generalized-hough
Vladislav Vinogradov [Mon, 7 Apr 2014 05:49:17 +0000 (09:49 +0400)]
disable GeneralizedHough tests on gcc 4.7
Vladislav Vinogradov [Fri, 4 Apr 2014 06:31:33 +0000 (10:31 +0400)]
disable gpu::GeneralizedHough compilation on gcc 4.7
Roman Donchenko [Tue, 1 Apr 2014 08:16:25 +0000 (12:16 +0400)]
Merge pull request #2554 from asmorkalov:ocv_249_version
Alexander Smorkalov [Mon, 31 Mar 2014 16:23:56 +0000 (09:23 -0700)]
OpenCV version++. OpenCV Manager version++.
Andrey Pavlenko [Mon, 31 Mar 2014 19:21:06 +0000 (23:21 +0400)]
Merge pull request #2553 from ilya-lavrenov:typo
Andrey Pavlenko [Mon, 31 Mar 2014 17:21:27 +0000 (21:21 +0400)]
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
Andrey Pavlenko [Mon, 31 Mar 2014 16:19:21 +0000 (20:19 +0400)]
Merge pull request #2548 from jet47:gpu_mog2_test
Ilya Lavrenov [Mon, 31 Mar 2014 15:45:55 +0000 (19:45 +0400)]
doc typos
Ilya Lavrenov [Mon, 31 Mar 2014 13:30:08 +0000 (17:30 +0400)]
fixed C4505
Andrey Pavlenko [Mon, 31 Mar 2014 11:48:45 +0000 (15:48 +0400)]
Merge pull request #2541 from JinoBetti:2.4
Vladislav Vinogradov [Mon, 31 Mar 2014 01:02:03 +0000 (18:02 -0700)]
increase epsilon for MOG2::getBackgroundImage test:
it uses float arithmetics
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.
JinoBetti [Thu, 27 Mar 2014 15:28:40 +0000 (16:28 +0100)]
Update out.cpp
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row
see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
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
projects / profile / ivi / opencv.git / log