platform/upstream/opencv.git
10 years agodocs fixes
Konstantin Matskevich [Mon, 19 May 2014 05:54:15 +0000 (09:54 +0400)]
docs fixes

10 years agodocs
Konstantin Matskevich [Thu, 8 May 2014 12:43:03 +0000 (16:43 +0400)]
docs

10 years agofixes
Konstantin Matskevich [Wed, 7 May 2014 13:19:22 +0000 (17:19 +0400)]
fixes

10 years agoadded additionalInfo in faceRecognition
Konstantin Matskevich [Tue, 6 May 2014 12:30:03 +0000 (16:30 +0400)]
added additionalInfo in faceRecognition

10 years agoMerge pull request #2693 from mvukad:bugfix_ippmorphop
Alexander Alekhin [Wed, 7 May 2014 09:15:07 +0000 (13:15 +0400)]
Merge pull request #2693 from mvukad:bugfix_ippmorphop

10 years agoMerge pull request #2636 from atrebbi:#3653
Alexander Alekhin [Mon, 5 May 2014 14:00:17 +0000 (18:00 +0400)]
Merge pull request #2636 from atrebbi:#3653

10 years agoMerge pull request #2696 from PhilLab:2.4
Alexander Alekhin [Mon, 5 May 2014 13:08:47 +0000 (17:08 +0400)]
Merge pull request #2696 from PhilLab:2.4

10 years agoUpdated documentation: library names
PhilLab [Mon, 5 May 2014 10:16:48 +0000 (12:16 +0200)]
Updated documentation: library names

updated the library names to OpenCV version 2.4.9

10 years agoFixed bug in IPPMorphOp function when looping over elements of the morphology kernel.
Michael Vukadinovic [Thu, 1 May 2014 18:52:49 +0000 (11:52 -0700)]
Fixed bug in IPPMorphOp function when looping over elements of the morphology kernel.

10 years agoMerge pull request #2659 from adrians:docs_pull_1
Roman Donchenko [Mon, 28 Apr 2014 07:36:12 +0000 (11:36 +0400)]
Merge pull request #2659 from adrians:docs_pull_1

10 years agoDocumentation - minor fix-ups
Adrian Stratulat [Wed, 23 Apr 2014 17:30:27 +0000 (17:30 +0000)]
Documentation - minor fix-ups

10 years agoMerge pull request #2640 from a-wi:2.4
Roman Donchenko [Tue, 22 Apr 2014 08:01:47 +0000 (12:01 +0400)]
Merge pull request #2640 from a-wi:2.4

10 years agoFix for issue #3645 (http://code.opencv.org/issues/3645).
Artur Wieczorek [Sun, 20 Apr 2014 19:37:29 +0000 (21:37 +0200)]
Fix for issue #3645 (code.opencv.org/issues/3645).
Implement missing features in CvCaptureCAM_VFW class.

Implemented missing CvCaptureCAM_VFW::setProperty() member function (handling CV_CAP_PROP_FRAME_WIDTH, CV_CAP_PROP_FRAME_HEIGHT, CV_CAP_PROP_FPS properties).
Extended CvCaptureCAM_VFW::setProperty()/getProperty() functions to handle also CV_CAP_PROP_FPS property.
Minor refactoring of CvCaptureCAM_VFW class.

10 years agofix for compiling 2.4 opencv with xcode 5.1
Alessandro Trebbi [Fri, 18 Apr 2014 11:42:47 +0000 (13:42 +0200)]
fix for compiling 2.4 opencv with xcode 5.1

10 years agoMerge pull request #2544 from alalek:perf_report_regressions
Andrey Pavlenko [Tue, 15 Apr 2014 12:17:39 +0000 (16:17 +0400)]
Merge pull request #2544 from alalek:perf_report_regressions

10 years agoMerge pull request #2016 from pemmanuelviel:kmeansppSquareDist
Vadim Pisarevsky [Tue, 15 Apr 2014 09:31:47 +0000 (13:31 +0400)]
Merge pull request #2016 from pemmanuelviel:kmeansppSquareDist

10 years agoMerge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos
Roman Donchenko [Fri, 11 Apr 2014 10:15:26 +0000 (14:15 +0400)]
Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos

10 years agoMerge pull request #2579 from maksqwe:test_operations_fix
Roman Donchenko [Fri, 11 Apr 2014 10:14:33 +0000 (14:14 +0400)]
Merge pull request #2579 from maksqwe:test_operations_fix

10 years agoMerge pull request #2603 from maksqwe:unused_fix_2.4
Roman Donchenko [Fri, 11 Apr 2014 10:14:04 +0000 (14:14 +0400)]
Merge pull request #2603 from maksqwe:unused_fix_2.4

10 years agoMerge pull request #2575 from rold2007:Bugfix_1437
Vadim Pisarevsky [Thu, 10 Apr 2014 09:31:33 +0000 (13:31 +0400)]
Merge pull request #2575 from rold2007:Bugfix_1437

10 years agoMerge pull request #2599 from maksqwe:test_calibration_2.4
Vadim Pisarevsky [Thu, 10 Apr 2014 09:30:36 +0000 (13:30 +0400)]
Merge pull request #2599 from maksqwe:test_calibration_2.4

10 years agoMerge pull request #2591 from Nerei:viz_cloud_shading_support
Vadim Pisarevsky [Thu, 10 Apr 2014 09:29:58 +0000 (13:29 +0400)]
Merge pull request #2591 from Nerei:viz_cloud_shading_support

10 years agoremove unused variables in CV_KDTreeTest_CPP::findNeighbors()
Maks Naumov [Wed, 9 Apr 2014 20:07:48 +0000 (23:07 +0300)]
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()

10 years agoremove unused variable in TEST_P()
Maks Naumov [Wed, 9 Apr 2014 20:06:06 +0000 (23:06 +0300)]
remove unused variable in TEST_P()

10 years agoremove unused variable in OCL_PERF_TEST_P()
Maks Naumov [Wed, 9 Apr 2014 20:04:29 +0000 (23:04 +0300)]
remove unused variable in OCL_PERF_TEST_P()

10 years agoremove unused variable in ocl_moments()
Maks Naumov [Wed, 9 Apr 2014 20:01:49 +0000 (23:01 +0300)]
remove unused variable in ocl_moments()

10 years agoremove unused variable in findCorners_caller()
Maks Naumov [Wed, 9 Apr 2014 19:59:52 +0000 (22:59 +0300)]
remove unused variable in findCorners_caller()

10 years agoremove unused variable in HOGDescriptor::groupRectangles()
Maks Naumov [Wed, 9 Apr 2014 19:56:19 +0000 (22:56 +0300)]
remove unused variable in HOGDescriptor::groupRectangles()

10 years agoremove unused variable in loadFromXML()
Maks Naumov [Wed, 9 Apr 2014 19:53:36 +0000 (22:53 +0300)]
remove unused variable in loadFromXML()

10 years agoMerge pull request #1 from Itseez/2.4
Maks Naumov [Wed, 9 Apr 2014 19:48:19 +0000 (22:48 +0300)]
Merge pull request #1 from Itseez/2.4

2.4

10 years agofix typo in test_cameracalibration
Maks Naumov [Wed, 9 Apr 2014 11:41:16 +0000 (14:41 +0300)]
fix typo in test_cameracalibration

10 years agoCorrected bug #1437. Corrected the cast of two short values from an lParam. lParam...
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.

10 years agoAdded cloud shading support - additional normals array is used
Anatoly Baksheev [Tue, 8 Apr 2014 16:26:56 +0000 (20:26 +0400)]
Added cloud shading support - additional normals array is used

10 years agoFix typos in old python wrapper documentation(Bug #3628)
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

10 years agofix condition in CV_OperationsTest::operations1()
Maks Naumov [Mon, 7 Apr 2014 08:24:27 +0000 (11:24 +0300)]
fix condition in CV_OperationsTest::operations1()

10 years agoMerge pull request #2572 from jet47:gpu-generalized-hough
Roman Donchenko [Mon, 7 Apr 2014 07:57:52 +0000 (11:57 +0400)]
Merge pull request #2572 from jet47:gpu-generalized-hough

10 years agodisable GeneralizedHough tests on gcc 4.7
Vladislav Vinogradov [Mon, 7 Apr 2014 05:49:17 +0000 (09:49 +0400)]
disable GeneralizedHough tests on gcc 4.7

10 years agodisable gpu::GeneralizedHough compilation 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

10 years agoMerge pull request #2554 from asmorkalov:ocv_249_version
Roman Donchenko [Tue, 1 Apr 2014 08:16:25 +0000 (12:16 +0400)]
Merge pull request #2554 from asmorkalov:ocv_249_version

10 years agoOpenCV version++. OpenCV Manager version++.
Alexander Smorkalov [Mon, 31 Mar 2014 16:23:56 +0000 (09:23 -0700)]
OpenCV version++. OpenCV Manager version++.

10 years agoMerge pull request #2553 from ilya-lavrenov:typo
Andrey Pavlenko [Mon, 31 Mar 2014 19:21:06 +0000 (23:21 +0400)]
Merge pull request #2553 from ilya-lavrenov:typo

10 years agoMerge pull request #2551 from ilya-lavrenov:ocl_nonfree
Andrey Pavlenko [Mon, 31 Mar 2014 17:21:27 +0000 (21:21 +0400)]
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree

10 years agoMerge pull request #2548 from jet47:gpu_mog2_test
Andrey Pavlenko [Mon, 31 Mar 2014 16:19:21 +0000 (20:19 +0400)]
Merge pull request #2548 from jet47:gpu_mog2_test

10 years agodoc typos
Ilya Lavrenov [Mon, 31 Mar 2014 15:45:55 +0000 (19:45 +0400)]
doc typos

10 years agofixed C4505
Ilya Lavrenov [Mon, 31 Mar 2014 13:30:08 +0000 (17:30 +0400)]
fixed C4505

10 years agoperf report: summary.py: added custom --regressions map
Alexander Alekhin [Fri, 28 Mar 2014 11:11:10 +0000 (15:11 +0400)]
perf report: summary.py: added custom --regressions map

10 years agoMerge pull request #2541 from JinoBetti:2.4
Andrey Pavlenko [Mon, 31 Mar 2014 11:48:45 +0000 (15:48 +0400)]
Merge pull request #2541 from JinoBetti:2.4

10 years agoincrease epsilon for MOG2::getBackgroundImage test:
Vladislav Vinogradov [Mon, 31 Mar 2014 01:02:03 +0000 (18:02 -0700)]
increase epsilon for MOG2::getBackgroundImage test:

it uses float arithmetics

10 years agoMerge pull request #2543 from apavlenko:24_haar_revert
Andrey Pavlenko [Fri, 28 Mar 2014 19:17:07 +0000 (23:17 +0400)]
Merge pull request #2543 from apavlenko:24_haar_revert

10 years agoMerge pull request #2534 from asmorkalov:opencv_config_cut_cuda_abs_path
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

10 years agoOpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
Alexander Smorkalov [Wed, 26 Mar 2014 19:26:21 +0000 (23:26 +0400)]
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.

10 years agoRevert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"
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

10 years ago- fix test
Andrey Pavlenko [Fri, 28 Mar 2014 12:06:39 +0000 (16:06 +0400)]
- fix test

10 years agoRevert "Merge pull request #1779 from perping:integral_2.4"
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.

10 years agoMerge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
Roman Donchenko [Fri, 28 Mar 2014 08:45:39 +0000 (12:45 +0400)]
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix

10 years agoMerge pull request #2539 from mjul:fixtypos
Roman Donchenko [Fri, 28 Mar 2014 07:58:23 +0000 (11:58 +0400)]
Merge pull request #2539 from mjul:fixtypos

10 years agoMerge pull request #2540 from mjul:fixtypos_2.4
Roman Donchenko [Fri, 28 Mar 2014 07:58:11 +0000 (11:58 +0400)]
Merge pull request #2540 from mjul:fixtypos_2.4

10 years agoBug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
Alexander Smorkalov [Fri, 28 Mar 2014 00:56:31 +0000 (04:56 +0400)]
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.

10 years agoUpdate out.cpp
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

10 years agoMerge pull request #2537 from ilya-lavrenov:doc_fix
Roman Donchenko [Thu, 27 Mar 2014 13:43:02 +0000 (17:43 +0400)]
Merge pull request #2537 from ilya-lavrenov:doc_fix

10 years agoFixed typo in BFMatcher in docs.
Martin Jul [Thu, 27 Mar 2014 12:52:49 +0000 (13:52 +0100)]
Fixed typo in BFMatcher in docs.

10 years agodoc fix
Ilya Lavrenov [Thu, 27 Mar 2014 12:30:29 +0000 (16:30 +0400)]
doc fix

10 years agoMerge branch '2.4' into fixtypos
Martin Jul [Thu, 27 Mar 2014 12:20:48 +0000 (13:20 +0100)]
Merge branch '2.4' into fixtypos

10 years agoFixed typos in "matching"
Martin Jul [Wed, 26 Mar 2014 22:29:48 +0000 (23:29 +0100)]
Fixed typos in "matching"

10 years agoMerge pull request #2527 from apavlenko:ocl_surf_24
Andrey Pavlenko [Wed, 26 Mar 2014 15:03:44 +0000 (19:03 +0400)]
Merge pull request #2527 from apavlenko:ocl_surf_24

10 years agosplitting plain and OCL tests for SURF.
Andrey Pavlenko [Tue, 25 Mar 2014 12:19:45 +0000 (16:19 +0400)]
splitting plain and OCL tests for SURF.

10 years agoMerge pull request #2404 from yashdv:old_basic_structures_doc_fix
Roman Donchenko [Wed, 26 Mar 2014 08:18:39 +0000 (12:18 +0400)]
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix

10 years agodisabling calls to SURF_OCL causing tests failures
Andrey Pavlenko [Tue, 25 Mar 2014 10:09:49 +0000 (14:09 +0400)]
disabling calls to SURF_OCL causing tests failures

10 years agofixing conditional compilation
Andrey Pavlenko [Tue, 25 Mar 2014 09:16:42 +0000 (13:16 +0400)]
fixing conditional compilation

10 years agofixing check_docs2.py issue
Andrey Pavlenko [Tue, 25 Mar 2014 09:15:56 +0000 (13:15 +0400)]
fixing check_docs2.py issue

10 years agoMerge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
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

10 years agoMerge pull request #2521 from atrebbi:#3620
Roman Donchenko [Mon, 24 Mar 2014 14:54:00 +0000 (18:54 +0400)]
Merge pull request #2521 from atrebbi:#3620

10 years agoMerge pull request #2516 from Daniil-Osokin:fix_docs
Roman Donchenko [Mon, 24 Mar 2014 14:52:49 +0000 (18:52 +0400)]
Merge pull request #2516 from Daniil-Osokin:fix_docs

10 years agoRemoved obsolete list from docs
Daniil Osokin [Mon, 24 Mar 2014 09:02:22 +0000 (13:02 +0400)]
Removed obsolete list from docs

10 years agoMerge pull request #2520 from vlkolesnikov:misprint_fix
Roman Donchenko [Mon, 24 Mar 2014 10:05:17 +0000 (14:05 +0400)]
Merge pull request #2520 from vlkolesnikov:misprint_fix

10 years agoFixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
Daniil Osokin [Fri, 21 Mar 2014 16:32:14 +0000 (20:32 +0400)]
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.

10 years agoMerge pull request #2514 from asmorkalov:android_two_libs_cuda
Roman Donchenko [Mon, 24 Mar 2014 08:26:57 +0000 (12:26 +0400)]
Merge pull request #2514 from asmorkalov:android_two_libs_cuda

10 years agoMerge pull request #2504 from asmorkalov:android_camera_locks_24
Roman Donchenko [Mon, 24 Mar 2014 08:06:50 +0000 (12:06 +0400)]
Merge pull request #2504 from asmorkalov:android_camera_locks_24

10 years agoMerge pull request #2513 from asmorkalov:ocv_cuda_link_revert
Roman Donchenko [Mon, 24 Mar 2014 08:03:26 +0000 (12:03 +0400)]
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert

10 years agoMisprint fixed in table formatter
Vladimir Kolesnikov [Mon, 24 Mar 2014 07:04:49 +0000 (11:04 +0400)]
Misprint fixed in table formatter

10 years agoMerge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
Andrey Pavlenko [Mon, 24 Mar 2014 06:25:47 +0000 (10:25 +0400)]
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree

10 years agoMerge pull request #2517 from ilya-lavrenov:fix
Andrey Pavlenko [Mon, 24 Mar 2014 06:25:03 +0000 (10:25 +0400)]
Merge pull request #2517 from ilya-lavrenov:fix

10 years agodisabling failing tests
Andrey Pavlenko [Mon, 24 Mar 2014 06:12:02 +0000 (10:12 +0400)]
disabling failing tests

10 years agomaking OCL tests conform to the comon style
Andrey Pavlenko [Mon, 24 Mar 2014 06:08:44 +0000 (10:08 +0400)]
making OCL tests conform to the comon style

10 years ago-
Alessandro Trebbi [Sun, 23 Mar 2014 21:00:16 +0000 (22:00 +0100)]
-

10 years agodoc fix
Ilya Lavrenov [Sun, 23 Mar 2014 12:20:00 +0000 (16:20 +0400)]
doc fix

10 years agoAdded guard to prevent from gpu module redefinition in OpenCV.mk
Alexander Smorkalov [Fri, 21 Mar 2014 14:20:57 +0000 (18:20 +0400)]
Added guard to prevent from gpu module redefinition in OpenCV.mk

10 years agoKeep definitions of link aliases consistent
Kang Liu [Fri, 21 Mar 2014 21:28:48 +0000 (22:28 +0100)]
Keep definitions of link aliases consistent

10 years agoFixed Load, Modify, and Save an Image tutorial
Daniil Osokin [Fri, 21 Mar 2014 15:28:42 +0000 (19:28 +0400)]
Fixed Load, Modify, and Save an Image tutorial

10 years agoMerge pull request #2454 from apavlenko:2.4_haar_extend
Andrey Pavlenko [Fri, 21 Mar 2014 14:45:58 +0000 (18:45 +0400)]
Merge pull request #2454 from apavlenko:2.4_haar_extend

10 years agoImplicit linkage with CUDA runtime reverted.
Alexander Smorkalov [Fri, 21 Mar 2014 13:58:59 +0000 (17:58 +0400)]
Implicit linkage with CUDA runtime reverted.

10 years agoMultiple fixes in camera.
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.

10 years agoMerge pull request #2501 from asmorkalov:android_native_camera_qualcomm
Roman Donchenko [Fri, 21 Mar 2014 12:28:47 +0000 (16:28 +0400)]
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm

10 years agoMerge pull request #2510 from asmorkalov:android_cuda_filter_fix
Roman Donchenko [Fri, 21 Mar 2014 12:00:29 +0000 (16:00 +0400)]
Merge pull request #2510 from asmorkalov:android_cuda_filter_fix

10 years agoremove highlighting in some function links
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`

10 years agoadding missing include (fixing 'no ocl implementation' error)
Andrey Pavlenko [Fri, 21 Mar 2014 10:30:49 +0000 (14:30 +0400)]
adding missing include (fixing 'no ocl implementation' error)

10 years agoNative camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
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.

10 years agoMerge pull request #2400 from RJ2:Bugfix_2
Roman Donchenko [Fri, 21 Mar 2014 09:58:05 +0000 (13:58 +0400)]
Merge pull request #2400 from RJ2:Bugfix_2

10 years agoMerge pull request #2423 from RJ2:bugfix_5
Roman Donchenko [Fri, 21 Mar 2014 09:54:51 +0000 (13:54 +0400)]
Merge pull request #2423 from RJ2:bugfix_5

10 years agoLibraries filter update after abs path cut.
Alexander Smorkalov [Fri, 21 Mar 2014 08:48:38 +0000 (12:48 +0400)]
Libraries filter update after abs path cut.