platform/upstream/opencv.git
10 years agoMore accurate deb package build fix for CUDA 6.5 and newer.
Alexander Smorkalov [Mon, 14 Jul 2014 19:58:05 +0000 (23:58 +0400)]
More accurate deb package build fix for CUDA 6.5 and newer.

(cherry picked from commit b2790973a32eb662c165a921afe03dbfd2c65269)
(cherry picked from commit f8758da289c092fcce10baa4723d6388c4e41cb3)

10 years agoDeb package build fix for CUDA 6.5 and newer.
Alexander Smorkalov [Mon, 14 Jul 2014 17:27:23 +0000 (21:27 +0400)]
Deb package build fix for CUDA 6.5 and newer.

(cherry picked from commit e650d87e470b2e6a8f87ad4dd81977748a136aee)
(cherry picked from commit ca9c52ac9778d01eba933a786b4303c79d0162be)

10 years agoMerge pull request #2985 from StevenPuttemans:fix_3777_redo
Vadim Pisarevsky [Sat, 19 Jul 2014 18:02:20 +0000 (18:02 +0000)]
Merge pull request #2985 from StevenPuttemans:fix_3777_redo

10 years agofixing bug 3777
StevenPuttemans [Fri, 18 Jul 2014 10:49:56 +0000 (12:49 +0200)]
fixing bug 3777

10 years agoMerge pull request #2948 from PhilLab:patch-1
Vadim Pisarevsky [Fri, 18 Jul 2014 10:10:44 +0000 (10:10 +0000)]
Merge pull request #2948 from PhilLab:patch-1

10 years agoMerge pull request #2984 from cambyse:2.4
Vadim Pisarevsky [Fri, 18 Jul 2014 10:05:22 +0000 (10:05 +0000)]
Merge pull request #2984 from cambyse:2.4

10 years agoMerge pull request #2980 from akarsakov:revert_dft_dst_fix
Vadim Pisarevsky [Fri, 18 Jul 2014 09:57:51 +0000 (09:57 +0000)]
Merge pull request #2980 from akarsakov:revert_dft_dst_fix

10 years agoMerge pull request #2898 from PhilLab:2.4
Vadim Pisarevsky [Fri, 18 Jul 2014 09:26:49 +0000 (09:26 +0000)]
Merge pull request #2898 from PhilLab:2.4

10 years agoClarified DescriptorExtractor::compute
PhilLab [Thu, 3 Jul 2014 10:29:33 +0000 (12:29 +0200)]
Clarified DescriptorExtractor::compute

10 years agobug fix 3381
Camille [Thu, 17 Jul 2014 22:06:31 +0000 (00:06 +0200)]
bug fix 3381

10 years agobug fix 3381
Camille [Thu, 17 Jul 2014 20:57:31 +0000 (22:57 +0200)]
bug fix 3381

10 years agoRevert changes by PR#2930 since it breaks logic of inverse mode.
Alexander Karsakov [Thu, 17 Jul 2014 11:11:06 +0000 (15:11 +0400)]
Revert changes by PR#2930 since it breaks logic of inverse mode.

10 years agoMerge pull request #2970 from PhilLab:patch-3
Vadim Pisarevsky [Wed, 16 Jul 2014 19:26:46 +0000 (19:26 +0000)]
Merge pull request #2970 from PhilLab:patch-3

10 years agoFunction for drawing arrows
unknown [Fri, 11 Jul 2014 17:43:04 +0000 (19:43 +0200)]
Function for drawing arrows

10 years agoMerge pull request #2909 from StevenPuttemans:bugfix_profileface_model
Vadim Pisarevsky [Tue, 15 Jul 2014 09:47:52 +0000 (09:47 +0000)]
Merge pull request #2909 from StevenPuttemans:bugfix_profileface_model

10 years agoMerge pull request #2965 from soulslicer:patch-2
Vadim Pisarevsky [Tue, 15 Jul 2014 09:44:32 +0000 (09:44 +0000)]
Merge pull request #2965 from soulslicer:patch-2

10 years agoMerge pull request #2966 from PhilLab:patch-2
Vadim Pisarevsky [Tue, 15 Jul 2014 08:10:33 +0000 (08:10 +0000)]
Merge pull request #2966 from PhilLab:patch-2

10 years agoMerge pull request #2967 from LeonidBeynenson:bugfix_wave_correction_wrong_result
Vadim Pisarevsky [Tue, 15 Jul 2014 08:10:04 +0000 (08:10 +0000)]
Merge pull request #2967 from LeonidBeynenson:bugfix_wave_correction_wrong_result

10 years agoMerge pull request #2780 from hbadino:Feature_3692_2.4
Vadim Pisarevsky [Mon, 14 Jul 2014 19:00:52 +0000 (19:00 +0000)]
Merge pull request #2780 from hbadino:Feature_3692_2.4

10 years agoMerge pull request #2959 from StevenPuttemans:add_notice_loaded_parameters
Vadim Pisarevsky [Mon, 14 Jul 2014 18:47:13 +0000 (18:47 +0000)]
Merge pull request #2959 from StevenPuttemans:add_notice_loaded_parameters

10 years agoMerge pull request #2957 from cambyse:2.4
Vadim Pisarevsky [Mon, 14 Jul 2014 18:42:49 +0000 (18:42 +0000)]
Merge pull request #2957 from cambyse:2.4

10 years agoMerge pull request #2971 from ruslo:docfix
Vadim Pisarevsky [Mon, 14 Jul 2014 18:40:38 +0000 (18:40 +0000)]
Merge pull request #2971 from ruslo:docfix

10 years agoMerge pull request #2972 from apavlenko:24_face_rec_sample
Vadim Pisarevsky [Mon, 14 Jul 2014 18:35:37 +0000 (18:35 +0000)]
Merge pull request #2972 from apavlenko:24_face_rec_sample

10 years agoMerge pull request #2815 from Aletheios:Bugfix#3705
Roman Donchenko [Mon, 14 Jul 2014 12:19:31 +0000 (12:19 +0000)]
Merge pull request #2815 from Aletheios:Bugfix#3705

10 years agoMerge pull request #2975 from asmorkalov:ocv_cuda_6.5_fix
Roman Donchenko [Mon, 14 Jul 2014 12:11:49 +0000 (12:11 +0000)]
Merge pull request #2975 from asmorkalov:ocv_cuda_6.5_fix

10 years agoBuild fixes for CUDA 6.5
Alexander Smorkalov [Mon, 14 Jul 2014 10:26:50 +0000 (14:26 +0400)]
Build fixes for CUDA 6.5

10 years agoMerge pull request #2955 from SpecLad:find-libv4l2
Roman Donchenko [Mon, 14 Jul 2014 08:21:24 +0000 (08:21 +0000)]
Merge pull request #2955 from SpecLad:find-libv4l2

10 years agoDoc: fix definition of macro CV_MAKETYPE
Ruslan Baratov [Sat, 12 Jul 2014 15:35:22 +0000 (19:35 +0400)]
Doc: fix definition of macro CV_MAKETYPE

At least this is how it's defined in core/types_c.h

10 years agoimproving face-rec sample:
Andrey Pavlenko [Sat, 12 Jul 2014 15:28:43 +0000 (19:28 +0400)]
improving face-rec sample:
* CSV can contain dir-s and wildcards
* save trained model

10 years agoMerge pull request #2903 from mmaraya:2.4
Roman Donchenko [Fri, 11 Jul 2014 14:15:59 +0000 (14:15 +0000)]
Merge pull request #2903 from mmaraya:2.4

10 years agoFixed bug in cv::detail::waveCorrect
Leonid Beynenson [Fri, 11 Jul 2014 11:47:41 +0000 (15:47 +0400)]
Fixed bug in cv::detail::waveCorrect

The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.

10 years agoadded extra warning about the automatic parameter loading for traincascade applicatio...
StevenPuttemans [Thu, 10 Jul 2014 11:28:32 +0000 (13:28 +0200)]
added extra warning about the automatic parameter loading for traincascade application when the param.xml file already exists

10 years agoAdded publication reference
PhilLab [Fri, 11 Jul 2014 07:22:55 +0000 (09:22 +0200)]
Added publication reference

10 years agoUpdate facedetect.cpp
Raaj [Fri, 11 Jul 2014 00:44:40 +0000 (17:44 -0700)]
Update facedetect.cpp

Somebody forgot to add curly brackets

10 years agobug fix 3696
Camille [Wed, 9 Jul 2014 20:35:56 +0000 (22:35 +0200)]
bug fix 3696

10 years agoMerge pull request #2954 from ilya-lavrenov:doc_fix
Alexander Alekhin [Wed, 9 Jul 2014 14:57:46 +0000 (14:57 +0000)]
Merge pull request #2954 from ilya-lavrenov:doc_fix

10 years agofixed docs
Ilya Lavrenov [Wed, 9 Jul 2014 13:46:22 +0000 (17:46 +0400)]
fixed docs

10 years agocap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
Roman Donchenko [Wed, 9 Jul 2014 12:55:40 +0000 (16:55 +0400)]
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both

How this worked before, I do not know.

10 years agoFixed C++11 compatibility warning
unknown [Wed, 9 Jul 2014 12:19:15 +0000 (14:19 +0200)]
Fixed C++11 compatibility warning

10 years agoMerge pull request #2883 from berak:b_3756_24
Roman Donchenko [Wed, 9 Jul 2014 07:49:47 +0000 (07:49 +0000)]
Merge pull request #2883 from berak:b_3756_24

10 years agoadded missing impl for multi-dim Mat::ones, Mat::zeros (issue #3756)
berak [Tue, 8 Jul 2014 15:26:23 +0000 (17:26 +0200)]
added missing impl for multi-dim Mat::ones, Mat::zeros (issue #3756)

10 years agoMerge pull request #2558 from asmorkalov:ocv_matop_init_fix
Roman Donchenko [Tue, 8 Jul 2014 12:14:54 +0000 (12:14 +0000)]
Merge pull request #2558 from asmorkalov:ocv_matop_init_fix

10 years agoAdded cast and removed formatting error
PhilLab [Tue, 8 Jul 2014 11:24:35 +0000 (13:24 +0200)]
Added cast and removed formatting error

10 years agoDouble precision for solvePnPRansac()
PhilLab [Tue, 8 Jul 2014 09:52:42 +0000 (11:52 +0200)]
Double precision for solvePnPRansac()

solvePnPRansac() and pnpTask() now accept object or image points with double precision.

10 years agoMerge pull request #2908 from mmaraya:bug_3737
Vadim Pisarevsky [Mon, 7 Jul 2014 13:29:38 +0000 (13:29 +0000)]
Merge pull request #2908 from mmaraya:bug_3737

10 years agoMerge pull request #2930 from akarsakov:dft_dst_size_fix
Vadim Pisarevsky [Mon, 7 Jul 2014 11:21:11 +0000 (11:21 +0000)]
Merge pull request #2930 from akarsakov:dft_dst_size_fix

10 years agoFixed dst size
Alexander Karsakov [Thu, 3 Jul 2014 06:27:53 +0000 (10:27 +0400)]
Fixed dst size

10 years agoMerge pull request #2915 from SpecLad:core-useless-casts
Vadim Pisarevsky [Wed, 2 Jul 2014 14:25:52 +0000 (14:25 +0000)]
Merge pull request #2915 from SpecLad:core-useless-casts

10 years agoMerge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
Vadim Pisarevsky [Wed, 2 Jul 2014 14:24:09 +0000 (14:24 +0000)]
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors

10 years agoMerge pull request #2922 from ilya-lavrenov:mac_fix
Alexander Alekhin [Wed, 2 Jul 2014 12:18:10 +0000 (12:18 +0000)]
Merge pull request #2922 from ilya-lavrenov:mac_fix

10 years agoocl: fix mac and superres test
Alexander Alekhin [Tue, 1 Jul 2014 16:02:02 +0000 (20:02 +0400)]
ocl: fix mac and superres test

10 years agofix for fisheye
Ilya Lavrenov [Tue, 1 Jul 2014 10:53:39 +0000 (14:53 +0400)]
fix for fisheye

10 years agoMerge pull request #2905 from Jazmann:2.4
Vadim Pisarevsky [Tue, 1 Jul 2014 18:41:14 +0000 (18:41 +0000)]
Merge pull request #2905 from Jazmann:2.4

10 years agoMerge pull request #2917 from mmaraya:bug_3872
Vadim Pisarevsky [Tue, 1 Jul 2014 16:40:08 +0000 (16:40 +0000)]
Merge pull request #2917 from mmaraya:bug_3872

10 years agoMerge pull request #2914 from alalek:fix2.4
Vadim Pisarevsky [Tue, 1 Jul 2014 11:02:04 +0000 (11:02 +0000)]
Merge pull request #2914 from alalek:fix2.4

10 years agofixed warnings
Ilya Lavrenov [Tue, 1 Jul 2014 10:31:25 +0000 (14:31 +0400)]
fixed warnings

10 years agofixed two models, adding xml identifier to correct position
StevenPuttemans [Fri, 27 Jun 2014 12:53:43 +0000 (14:53 +0200)]
fixed two models, adding xml identifier to correct position

10 years agotest.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv...
Mike Maraya [Tue, 1 Jul 2014 02:17:52 +0000 (22:17 -0400)]
test.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv bug #3782

10 years agoRemove a couple of useless casts in core headers
Roman Donchenko [Mon, 30 Jun 2014 12:12:04 +0000 (16:12 +0400)]
Remove a couple of useless casts in core headers

This helps users who compile their code with -Wuseless-cast.

10 years agofix bug with invalid signature size (should not be less than signatureLength())
Alexander Alekhin [Mon, 30 Jun 2014 12:03:20 +0000 (16:03 +0400)]
fix bug with invalid signature size (should not be less than signatureLength())

10 years agofix python tests
Alexander Alekhin [Mon, 30 Jun 2014 12:03:07 +0000 (16:03 +0400)]
fix python tests

10 years agoFixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa...
Mike Maraya [Fri, 27 Jun 2014 12:34:40 +0000 (08:34 -0400)]
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)

10 years agoRevert "Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window...
Mike Maraya [Fri, 27 Jun 2014 12:20:22 +0000 (08:20 -0400)]
Revert "Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)"

This reverts commit 56683e6d112a808fbd51c74917f0c4d9d752f502.

10 years agoFixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa...
Mike Maraya [Fri, 27 Jun 2014 12:02:01 +0000 (08:02 -0400)]
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)

10 years agoFixes resizeWindow() on OS X (Bug #3200)
Mike Maraya [Sat, 28 Jun 2014 03:26:09 +0000 (23:26 -0400)]
Fixes resizeWindow() on OS X (Bug #3200)

10 years agoFixed typos in comments
unknown [Thu, 26 Jun 2014 12:17:57 +0000 (14:17 +0200)]
Fixed typos in comments

10 years agoMerge pull request #2766 from akarsakov:pyr_border_constant
Roman Donchenko [Thu, 26 Jun 2014 13:28:44 +0000 (17:28 +0400)]
Merge pull request #2766 from akarsakov:pyr_border_constant

10 years agoMerge pull request #2880 from GravityJack:SparseMatIterator-build-fix
Roman Donchenko [Wed, 25 Jun 2014 12:32:17 +0000 (16:32 +0400)]
Merge pull request #2880 from GravityJack:SparseMatIterator-build-fix

10 years agoMerge pull request #2891 from nisargthakkar:dims_zero_on_release
Roman Donchenko [Wed, 25 Jun 2014 12:27:33 +0000 (16:27 +0400)]
Merge pull request #2891 from nisargthakkar:dims_zero_on_release

10 years agoMerge pull request #2889 from Ilya-Krylov:fisheye
Vadim Pisarevsky [Tue, 24 Jun 2014 12:06:19 +0000 (12:06 +0000)]
Merge pull request #2889 from Ilya-Krylov:fisheye

10 years agoFix for VTK6.2 issue.
Jasper [Tue, 24 Jun 2014 10:52:56 +0000 (11:52 +0100)]
Fix for VTK6.2 issue.

10 years agoFix for Bug#3757: All dimension values are 0 after release is called
Nisarg Thakkar [Mon, 23 Jun 2014 14:45:23 +0000 (20:15 +0530)]
Fix for Bug#3757: All dimension values are 0 after release is called

10 years agoFixed android and windows x64 build issues
Ilya Krylov [Mon, 23 Jun 2014 13:06:40 +0000 (17:06 +0400)]
Fixed android and windows x64 build issues

10 years agoFixing build error when using post-increment operator.
Marc Rollins [Thu, 19 Jun 2014 21:14:10 +0000 (14:14 -0700)]
Fixing build error when using post-increment operator.

10 years agoMerge pull request #2870 from 23pointsNorth:patch-5
Roman Donchenko [Thu, 19 Jun 2014 12:52:00 +0000 (16:52 +0400)]
Merge pull request #2870 from 23pointsNorth:patch-5

10 years agoMerge pull request #2868 from neo008:2.4
Roman Donchenko [Thu, 19 Jun 2014 12:51:37 +0000 (16:51 +0400)]
Merge pull request #2868 from neo008:2.4

10 years agoMerge pull request #2843 from berak:f_export_bow_24
Andrey Pavlenko [Thu, 19 Jun 2014 09:08:32 +0000 (09:08 +0000)]
Merge pull request #2843 from berak:f_export_bow_24

10 years agoMerge pull request #2846 from alalek:2.4_fix_python_warnings
Alexander Alekhin [Wed, 18 Jun 2014 13:19:11 +0000 (13:19 +0000)]
Merge pull request #2846 from alalek:2.4_fix_python_warnings

10 years agoUpdated findHomography docs branch 2.4
Daniel Angelov [Mon, 16 Jun 2014 12:05:17 +0000 (13:05 +0100)]
Updated findHomography docs branch 2.4

Updated the documents to give warning to the users of `findHomography` that the function may return an empty matrix in some cases.
The user must take care of checking that.

10 years agoFix typos
Neo Alienson [Mon, 16 Jun 2014 10:48:10 +0000 (18:48 +0800)]
Fix typos

10 years agoMerge pull request #2726 from Ilya-Krylov:2.4
Vadim Pisarevsky [Thu, 12 Jun 2014 17:37:46 +0000 (21:37 +0400)]
Merge pull request #2726 from Ilya-Krylov:2.4

10 years agoMerge pull request #2779 from pemmanuelviel:kmeansppSquareDist
Vadim Pisarevsky [Thu, 12 Jun 2014 17:35:27 +0000 (21:35 +0400)]
Merge pull request #2779 from pemmanuelviel:kmeansppSquareDist

10 years agoadd Bag of Words to python wrapper
berak [Wed, 11 Jun 2014 09:50:22 +0000 (11:50 +0200)]
add Bag of Words to python wrapper

10 years agofix -Wmaybe-uninitialized warning (initialize pointers to NULL)
Alexander Alekhin [Tue, 10 Jun 2014 14:12:38 +0000 (18:12 +0400)]
fix -Wmaybe-uninitialized warning (initialize pointers to NULL)

10 years agoMerge pull request #2705 from KonstantinMatskevich:face_recognition_labels_info
Roman Donchenko [Tue, 10 Jun 2014 08:24:56 +0000 (12:24 +0400)]
Merge pull request #2705 from KonstantinMatskevich:face_recognition_labels_info

10 years agoMerge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
Roman Donchenko [Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)]
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4

10 years agoMerge pull request #2818 from StevenPuttemans:fix_linux_tutorial
Roman Donchenko [Mon, 9 Jun 2014 09:37:38 +0000 (13:37 +0400)]
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial

10 years agomoving FaceRecognizer2 from public header to .cpp
Andrey Pavlenko [Mon, 9 Jun 2014 09:26:45 +0000 (13:26 +0400)]
moving FaceRecognizer2 from public header to .cpp

10 years agoexport BOW to script wrappers
berak [Sat, 7 Jun 2014 14:34:53 +0000 (16:34 +0200)]
export BOW to script wrappers

10 years agofixed calculation method of "cv::TickMeter"
atinfinity [Fri, 6 Jun 2014 22:29:22 +0000 (07:29 +0900)]
fixed calculation method of "cv::TickMeter"

10 years agofacerec2
Konstantin Matskevich [Wed, 28 May 2014 11:28:54 +0000 (15:28 +0400)]
facerec2

10 years agofix typo in linux tutorial
StevenPuttemans [Mon, 2 Jun 2014 07:35:19 +0000 (09:35 +0200)]
fix typo in linux tutorial

10 years agoBugfix #3705: params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
aletheios [Sat, 31 May 2014 16:44:32 +0000 (18:44 +0200)]
Bugfix #3705: params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2

10 years agoMerge pull request #2771 from SpecLad:pvs-checks-opencv
Roman Donchenko [Thu, 29 May 2014 10:50:42 +0000 (14:50 +0400)]
Merge pull request #2771 from SpecLad:pvs-checks-opencv

10 years agoMerge pull request #2796 from berak:b_3674_24
Alexander Alekhin [Wed, 28 May 2014 09:28:30 +0000 (13:28 +0400)]
Merge pull request #2796 from berak:b_3674_24

10 years ago2 fixed unassigned reshapes in em (#3674)
berak [Wed, 28 May 2014 08:37:16 +0000 (10:37 +0200)]
2 fixed unassigned reshapes in em (#3674)

10 years agoMerge pull request #2793 from alalek:run_android_env
Roman Donchenko [Tue, 27 May 2014 09:35:10 +0000 (13:35 +0400)]
Merge pull request #2793 from alalek:run_android_env

10 years agorun.py: propagate OPENCV* env variables only with --android_propagate_opencv_env...
Alexander Alekhin [Mon, 26 May 2014 10:32:52 +0000 (14:32 +0400)]
run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag

10 years agorun.py: added --android_env parameter
Alexander Alekhin [Sun, 25 May 2014 21:19:16 +0000 (01:19 +0400)]
run.py: added --android_env parameter

10 years agoMerge pull request #2742 from StevenPuttemans:feature_3176
Roman Donchenko [Thu, 22 May 2014 14:03:56 +0000 (18:03 +0400)]
Merge pull request #2742 from StevenPuttemans:feature_3176